Skip to content

Commit fba9b1a

Browse files
authored
Merge pull request #1105 from maths/api-reconcile
Fold API code back into the main code base
2 parents 83771fe + db2a21b commit fba9b1a

File tree

74 files changed

+8243
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+8243
-30
lines changed

.gitlab-ci.yml

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
stages:
2+
- build
3+
- publish
4+
5+
build:
6+
stage: build
7+
tags:
8+
- docker-support
9+
script:
10+
- >
11+
docker build
12+
--pull
13+
--label "org.opencontainers.image.created=$CI_JOB_STARTED_AT"
14+
--label "org.opencontainers.image.revision=$CI_COMMIT_SHA"
15+
--label "org.opencontainers.image.version=$CI_COMMIT_REF_NAME"
16+
--target production
17+
-f ./api/docker/Dockerfile
18+
--tag $DOCKER_REGISTRY/$DOCKER_IMAGE:$CI_COMMIT_SHA
19+
.
20+
- docker save $DOCKER_REGISTRY/$DOCKER_IMAGE:$CI_COMMIT_SHA | gzip > image.tar.gz
21+
artifacts:
22+
name: "image"
23+
paths:
24+
- image.tar.gz
25+
expire_in: 1 day
26+
27+
publish-latest:
28+
variables:
29+
GIT_STRATEGY: none
30+
tags:
31+
- docker-support
32+
stage: publish
33+
only:
34+
- dynexite-api
35+
before_script:
36+
- echo -n $DOCKER_PASSWORD | docker login -u $DOCKER_USER --password-stdin $DOCKER_REGISTRY
37+
- echo -n $PUBLIC_IMAGE_MIRROR_PASSWORD | docker login -u $PUBLIC_IMAGE_MIRROR_USER --password-stdin $PUBLIC_IMAGE_MIRROR_REGISTRY
38+
script:
39+
- docker load < image.tar.gz
40+
- docker tag $DOCKER_REGISTRY/$DOCKER_IMAGE:$CI_COMMIT_SHA $DOCKER_REGISTRY/$DOCKER_IMAGE:latest
41+
- docker tag $DOCKER_REGISTRY/$DOCKER_IMAGE:$CI_COMMIT_SHA $PUBLIC_IMAGE_MIRROR_REGISTRY/$PUBLIC_IMAGE_MIRROR_IMAGE:latest
42+
- docker push $DOCKER_REGISTRY/$DOCKER_IMAGE:latest
43+
- docker push $PUBLIC_IMAGE_MIRROR_REGISTRY/$PUBLIC_IMAGE_MIRROR_IMAGE:latest
44+
45+
publish-tag:
46+
variables:
47+
GIT_STRATEGY: none
48+
tags:
49+
- docker-support
50+
stage: publish
51+
only:
52+
- tags
53+
before_script:
54+
- echo -n $DOCKER_PASSWORD | docker login -u $DOCKER_USER --password-stdin $DOCKER_REGISTRY
55+
- echo -n $PUBLIC_IMAGE_MIRROR_PASSWORD | docker login -u $PUBLIC_IMAGE_MIRROR_USER --password-stdin $PUBLIC_IMAGE_MIRROR_REGISTRY
56+
script:
57+
- docker load < image.tar.gz
58+
- docker tag $DOCKER_REGISTRY/$DOCKER_IMAGE:$CI_COMMIT_SHA $DOCKER_REGISTRY/$DOCKER_IMAGE:$CI_COMMIT_REF_NAME
59+
- docker tag $DOCKER_REGISTRY/$DOCKER_IMAGE:$CI_COMMIT_SHA $PUBLIC_IMAGE_MIRROR_REGISTRY/$PUBLIC_IMAGE_MIRROR_IMAGE:$CI_COMMIT_REF_NAME
60+
- docker push $DOCKER_REGISTRY/$DOCKER_IMAGE:$CI_COMMIT_REF_NAME
61+
- docker push $PUBLIC_IMAGE_MIRROR_REGISTRY/$PUBLIC_IMAGE_MIRROR_IMAGE:$CI_COMMIT_REF_NAME

api/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/vendor/

api/README.md

+270
Large diffs are not rendered by default.

api/composer.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "medien/stack",
3+
"type": "project",
4+
"require": {
5+
"slim/slim": "4.*",
6+
"slim/psr7": "^1.6",
7+
"erusev/parsedown": "^1.7.4"
8+
},
9+
"authors": [
10+
{
11+
"name": "Sven Kirschbaum",
12+
"email": "[email protected]"
13+
}
14+
],
15+
"autoload": {
16+
"psr-4": {
17+
"": ".."
18+
}
19+
}
20+
}

0 commit comments

Comments
 (0)