Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
c2715ed7
Commit
c2715ed7
authored
Mar 31, 2020
by
jp
Browse files
add imagemagick and update inherited container to alpine:3.11
parent
ec5d6eef
Changes
2
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
c2715ed7
...
...
@@ -288,7 +288,7 @@ docker:
-
export CI_VCS_REF=$CI_COMMIT_SHORT_SHA
allow_failure
:
true
script
:
-
docker build --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG -t $IMAGE_TAG_LATEST .
-
docker build
--cache-from $IMAGE_TAG_SLUG
--build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG -t $IMAGE_TAG_LATEST .
-
docker push $IMAGE_TAG
-
docker push $IMAGE_TAG_SLUG
-
docker push $IMAGE_TAG_LATEST
...
...
@@ -296,6 +296,7 @@ docker:
-
dind
only
:
-
develop@pleroma/pleroma
-
/^ops/.*$/@jp/pleroma
docker-stable
:
stage
:
docker
...
...
@@ -306,7 +307,7 @@ docker-stable:
before_script
:
*before-docker
allow_failure
:
true
script
:
-
docker build --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG -t $IMAGE_TAG_LATEST_STABLE .
-
docker build
--cache-from $IMAGE_TAG_SLUG
--build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG -t $IMAGE_TAG_LATEST_STABLE .
-
docker push $IMAGE_TAG
-
docker push $IMAGE_TAG_SLUG
-
docker push $IMAGE_TAG_LATEST_STABLE
...
...
@@ -324,7 +325,7 @@ docker-release:
before_script
:
*before-docker
allow_failure
:
true
script
:
-
docker build --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG .
-
docker build
--cache-from $IMAGE_TAG_SLUG
--build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG .
-
docker push $IMAGE_TAG
-
docker push $IMAGE_TAG_SLUG
tags
:
...
...
Dockerfile
View file @
c2715ed7
...
...
@@ -12,7 +12,7 @@ RUN apk add git gcc g++ musl-dev make &&\
mkdir
release
&&
\
mix release
--path
release
FROM
alpine:3.
9
FROM
alpine:3.
11
ARG
BUILD_DATE
ARG
VCS_REF
...
...
Haelwenn
@lanodan
mentioned in issue
#1662 (closed)
·
Apr 06, 2020
mentioned in issue
#1662 (closed)
mentioned in issue #1662
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment