From e4e533a1493769346018c5fcda7b3936d870da28 Mon Sep 17 00:00:00 2001 From: Stefan Verhoeven Date: Tue, 23 Apr 2024 10:50:43 +0200 Subject: [PATCH] Prepare for pulling images Refs #96 --- .devcontainer/docker-compose.yml | 8 ++++---- deploy/Dockerfile | 3 +++ deploy/Dockerfile.bartenderhaddock3 | 3 +++ deploy/Dockerfile.openssl | 6 ++++++ deploy/arq/docker-compose.yml | 10 +++++----- deploy/remoteslurm/docker-compose.yml | 6 +++--- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index f0d59112..56586e93 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -48,7 +48,7 @@ services: # below is same as in deploy/arq/docker-compose.yml, # but paths are relative to the /.devcontainer/ directory bartender: - image: ghcr.io/i-vresse/bartender + image: ghcr.io/i-vresse/bartender:${BARTENDER_TAG:-latest} build: context: ../deploy dockerfile: ./Dockerfile.bartenderhaddock3 @@ -100,7 +100,7 @@ services: restart: always bartenderworker: - image: ghcr.io/i-vresse/bartender + image: ghcr.io/i-vresse/bartender:${BARTENDER_TAG:-latest} build: context: ../deploy dockerfile: ./Dockerfile.bartenderhaddock3 @@ -119,7 +119,7 @@ services: condition: service_started certmaker: - image: ghcr.io/i-vresse/certmaker + image: ghcr.io/i-vresse/certmaker:${CERTMAKER_TAG:-latest} build: context: ../deploy/ dockerfile: ./Dockerfile.openssl @@ -129,7 +129,7 @@ services: restart: "no" h3restraints: - image: ghcr.io/i-vresse/bartender + image: ghcr.io/i-vresse/bartender:${BARTENDER_TAG:-latest} build: context: ../deploy dockerfile: ./Dockerfile.bartenderhaddock3 diff --git a/deploy/Dockerfile b/deploy/Dockerfile index e1dfe2ab..fd6798a9 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -1,4 +1,7 @@ # Docker file for haddock3-webapp +LABEL org.opencontainers.image.source=https://github.com/i-VRESSE/haddock3-webapp/blob/main/deploy/Dockerfile +LABEL org.opencontainers.image.licenses=Apache-2.0 +LABEL org.opencontainers.image.description="Haddock3 webapplication image." # base node image FROM node:18-bookworm-slim as base diff --git a/deploy/Dockerfile.bartenderhaddock3 b/deploy/Dockerfile.bartenderhaddock3 index 75f96de4..ad468f34 100644 --- a/deploy/Dockerfile.bartenderhaddock3 +++ b/deploy/Dockerfile.bartenderhaddock3 @@ -1,5 +1,8 @@ # Dockerfile for bartender web service with haddock3, lightdock, gdock executables. FROM python:3.9-slim-bookworm +LABEL org.opencontainers.image.source=https://github.com/i-VRESSE/haddock3-webapp/blob/main/deploy/Dockerfile.bartenderhaddock3 +LABEL org.opencontainers.image.licenses=Apache-2.0 +LABEL org.opencontainers.image.description="bartender web service with haddock3, lightdock, gdock executables. Image does not contain real cns executable, downstream should copy it to /opt/haddock3/bin/cns." ARG HADDOCK3_GHORG=haddocking ARG HADDOCK3_VERSION=main diff --git a/deploy/Dockerfile.openssl b/deploy/Dockerfile.openssl index accc80ca..c330d37b 100644 --- a/deploy/Dockerfile.openssl +++ b/deploy/Dockerfile.openssl @@ -1,4 +1,10 @@ +# Docker image that generates a rsa private/public key pair on startup. + +# The service with the public key (/certs/public_key.pem) can trust the service with the private key (/certs/private_key.pem). FROM alpine:3.19 +LABEL org.opencontainers.image.source=https://github.com/i-VRESSE/haddock3-webapp/blob/main/deploy/Dockerfile.openssl +LABEL org.opencontainers.image.licenses=Apache-2.0 +LABEL org.opencontainers.image.description="Generates a rsa private/public key pair on startup" RUN apk add --no-cache openssl diff --git a/deploy/arq/docker-compose.yml b/deploy/arq/docker-compose.yml index 5110ce43..c2878341 100644 --- a/deploy/arq/docker-compose.yml +++ b/deploy/arq/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.9" services: webapp: - image: ghcr.io/i-vresse/haddock3-webapp + image: ghcr.io/i-vresse/haddock3-webapp:${WEBAPP_TAG:-latest} build: context: ../.. dockerfile: deploy/Dockerfile @@ -44,7 +44,7 @@ services: retries: 40 bartender: - image: ghcr.io/i-vresse/bartender + image: ghcr.io/i-vresse/bartender:${BARTENDER_TAG:-latest} build: context: .. dockerfile: ./Dockerfile.bartenderhaddock3 @@ -93,7 +93,7 @@ services: restart: always bartenderworker: - image: ghcr.io/i-vresse/bartender + image: ghcr.io/i-vresse/bartender:${BARTENDER_TAG:-latest} build: context: .. dockerfile: ./Dockerfile.bartenderhaddock3 @@ -109,7 +109,7 @@ services: condition: service_started certmaker: - image: ghcr.io/i-vresse/certmaker + image: ghcr.io/i-vresse/certmaker:${CERTMAKER_TAG:-latest} build: context: .. dockerfile: ./Dockerfile.openssl @@ -119,7 +119,7 @@ services: restart: "no" h3restraints: - image: ghcr.io/i-vresse/bartender + image: ghcr.io/i-vresse/bartender:${BARTENDER_TAG:-latest} build: context: .. dockerfile: ./Dockerfile.bartenderhaddock3 diff --git a/deploy/remoteslurm/docker-compose.yml b/deploy/remoteslurm/docker-compose.yml index 41db0cc1..4f854744 100644 --- a/deploy/remoteslurm/docker-compose.yml +++ b/deploy/remoteslurm/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.9" services: webapp: - image: ghcr.io/i-vresse/haddock3-webapp + image: ghcr.io/i-vresse/haddock3-webapp:${WEBAPP_TAG:-latest} build: context: ../.. dockerfile: deploy/Dockerfile @@ -44,7 +44,7 @@ services: retries: 40 bartender: - image: ghcr.io/i-vresse/bartender + image: ghcr.io/i-vresse/bartender:${BARTENDER_TAG:-latest} build: context: .. dockerfile: ./Dockerfile.bartenderhaddock3 @@ -105,7 +105,7 @@ services: restart: "no" h3restraints: - image: ghcr.io/i-vresse/bartender + image: ghcr.io/i-vresse/bartender:${BARTENDER_TAG:-latest} build: context: .. dockerfile: ./Dockerfile.bartenderhaddock3