diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index b9de35ee..26874037 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -50,7 +50,7 @@ jobs: - name: Login to Harbor uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0 with: - registry: harbor.stfc.ac.uk/datagateway + registry: ${{ secrets.HARBOR_URL }} username: ${{ secrets.HARBOR_USERNAME }} password: ${{ secrets.HARBOR_TOKEN }} @@ -58,7 +58,7 @@ jobs: id: meta uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 # v4.6.0 with: - images: harbor.stfc.ac.uk/datagateway/scigateway + images: ${{ secrets.HARBOR_URL }}/scigateway - name: Build and push Docker image to Harbor uses: docker/build-push-action@0a97817b6ade9f46837855d676c4cca3a2471fc9 # v4.2.1 diff --git a/Dockerfile b/Dockerfile index dda5bcd3..70fb4951 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Dockerfile to build and serve scigateway # Build stage -FROM node:20.11-alpine3.18 as builder +FROM node:20.11.1-alpine3.19@sha256:bf77dc26e48ea95fca9d1aceb5acfa69d2e546b765ec2abfb502975f1a2d4def as builder WORKDIR /scigateway-build @@ -24,7 +24,7 @@ COPY docker/settings.json public/settings.json RUN yarn build # Run stage -FROM httpd:2.4-alpine3.15 +FROM httpd:2.4.58-alpine3.19@sha256:92535cf7f151901ba91b04186292c3bd5bf82aa6ffa6eb7bc405fefbffedd480 WORKDIR /usr/local/apache2/htdocs