diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e44ce5..c5b46a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ before_script: # Run tests test_build: stage: build - image: blockstream/satapi-builder@sha256:a3a137b80a08325bdd50a7c59ae0429b933e7a36db0d74f6ae34af067dfdee2d + image: blockstream/satapi-builder@sha256:a768bbd26e1b52dd681e122d35226943c043e9a35efeba45cea41a07d64357c4 only: - branches@satellite/ionosphere except: @@ -36,7 +36,7 @@ test_build: # Run tests and build docker images build: stage: build - image: blockstream/satapi-builder@sha256:a3a137b80a08325bdd50a7c59ae0429b933e7a36db0d74f6ae34af067dfdee2d + image: blockstream/satapi-builder@sha256:a768bbd26e1b52dd681e122d35226943c043e9a35efeba45cea41a07d64357c4 only: - master@satellite/ionosphere before_script: diff --git a/Dockerfile.ci b/Dockerfile.ci index abe3ed4..fa6eeba 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,9 +1,11 @@ +# docker build --cache-from blockstream/satapi-builder@sha256:a3a137b80a08325bdd50a7c59ae0429b933e7a36db0d74f6ae34af067dfdee2d -f Dockerfile.ci . + FROM docker@sha256:453c52a7a7200677f9effa3acc8498a2f71af77c2951ac5e1ac1391053573374 AS docker FROM alpine:latest COPY --from=docker /usr/local/bin/docker /usr/local/bin/docker -RUN apk --no-cache add curl python py-crcmod bash libc6-compat openssh-client git gnupg +RUN apk --no-cache add curl python python3 py-crcmod bash libc6-compat openssh-client git gnupg ENV RUBY_PACKAGES ruby ruby-io-console ruby-irb ruby-rake ruby-bundler ruby-bigdecimal ruby-json ENV RUBY_DEPS libstdc++ tzdata bash ca-certificates openssl sqlite sqlite-dev