aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Spek <p.spek@tyil.nl>2019-11-04 16:40:09 +0100
committerPatrick Spek <p.spek@tyil.nl>2019-11-04 16:40:09 +0100
commitac4dcc41d3748fe79801c1b0ccfde0e346c3f35a (patch)
treed697817168da946ef11faed26a3943e8c5e54878
parent85973fe63d197d7584a219cbbfb4c1ec96cf6a7e (diff)
Update Docker target
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--Dockerfile6
2 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93616d4..bcb0eff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,6 +82,3 @@ Docker:
script:
- docker build --build-arg "VERSION=$CI_COMMIT_REF_NAME" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" .
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
- artifacts:
- paths:
- - work
diff --git a/Dockerfile b/Dockerfile
index 09ea8bc..ef78892 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,12 +4,16 @@ ARG VERSION
COPY work /tmp
-RUN cd -- /tmp/rakudo-star-$VERSION
+RUN cd -- "$(mktemp -d)"
+RUN tar xzf "/tmp/release/rakudo-star-$VERSION.tar.gz"
+RUN cd -- "rakudo-star-$VERSION"
RUN apk add --no-cache build-base git perl perl-utils libressl
RUN perl Configure.pl --prefix=/usr/local --backend=moar --gen-moar --make-install
FROM alpine:latest
+RUN apk add --no-cache libressl
+
COPY --from=build /usr/local /usr/local
CMD [ "perl6" ]