diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32b08d8..5e1bb1e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ before_script: # Run tests test_build: stage: build - image: blockstream/satapi-builder@sha256:a768bbd26e1b52dd681e122d35226943c043e9a35efeba45cea41a07d64357c4 + image: blockstream/satapi-builder@sha256:35b3d427bc205407410eb4fbaa4c1865306d241a7a8b4d5d57ca4ec1926b373d only: - branches@satellite/ionosphere except: @@ -42,7 +42,7 @@ test_build: # Run tests and build docker images build: stage: build - image: blockstream/satapi-builder@sha256:a768bbd26e1b52dd681e122d35226943c043e9a35efeba45cea41a07d64357c4 + image: blockstream/satapi-builder@sha256:35b3d427bc205407410eb4fbaa4c1865306d241a7a8b4d5d57ca4ec1926b373d tags: - docker - k8s diff --git a/Dockerfile.ci b/Dockerfile.ci index fa6eeba..bc7f407 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,6 +1,6 @@ -# docker build --cache-from blockstream/satapi-builder@sha256:a3a137b80a08325bdd50a7c59ae0429b933e7a36db0d74f6ae34af067dfdee2d -f Dockerfile.ci . +# docker build --cache-from blockstream/satapi-builder@sha256:35b3d427bc205407410eb4fbaa4c1865306d241a7a8b4d5d57ca4ec1926b373d -t blockstream/satapi-builder:latest -f Dockerfile.ci . -FROM docker@sha256:453c52a7a7200677f9effa3acc8498a2f71af77c2951ac5e1ac1391053573374 AS docker +FROM docker@sha256:bc7f740e2c0a8a9ec43b009b7cd35aafb10e69488a017110ad723003fbd3a7ae AS docker FROM alpine:latest COPY --from=docker /usr/local/bin/docker /usr/local/bin/docker @@ -18,15 +18,14 @@ RUN apk update && \ RUN mkdir /app && \ mkdir -p /data/ionosphere -COPY Gemfile /app -COPY Gemfile.lock /app +COPY . /app WORKDIR /app # install packages needed for building compiled gems; install gems; then delete build dependencies to keep Docker image small ENV BUILD_PACKAGES sudo build-base ruby-dev libc-dev linux-headers openssl-dev RUN apk --update add --virtual build_deps $BUILD_PACKAGES && \ + bundle update --bundler && \ bundle install && \ apk del build_deps && \ rm -rf /var/cache/apk/* -COPY . /app