diff options
| author | crupest <crupest@outlook.com> | 2022-11-28 19:30:11 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2022-11-28 19:30:11 +0800 |
| commit | e0a570af9959b9270f01ee33478d05689826f465 (patch) | |
| tree | ee622515870ef8f6cda5768c716561b12b93b6bd | |
| parent | ff1b4a63111ee10d8bf6d2113a330357c281f769 (diff) | |
| download | crupest-e0a570af9959b9270f01ee33478d05689826f465.tar.gz crupest-e0a570af9959b9270f01ee33478d05689826f465.tar.bz2 crupest-e0a570af9959b9270f01ee33478d05689826f465.zip | |
Fix docker.
| -rw-r--r-- | docker/crupest-nginx/Dockerfile | 2 | ||||
| -rw-r--r-- | template/docker-compose.yaml.template | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/docker/crupest-nginx/Dockerfile b/docker/crupest-nginx/Dockerfile index 074e8cc..82fd900 100644 --- a/docker/crupest-nginx/Dockerfile +++ b/docker/crupest-nginx/Dockerfile @@ -4,7 +4,7 @@ COPY sites/www /sites/www WORKDIR /sites/www RUN pnpm install --frozen-lockfile && pnpm run build -FROM klakegg/ext-alpine AS build-blog +FROM klakegg/hugo:ext-alpine AS build-blog # install git RUN apk add --no-cache git RUN git submodule update --init --recursive diff --git a/template/docker-compose.yaml.template b/template/docker-compose.yaml.template index cccc4e9..563a9cc 100644 --- a/template/docker-compose.yaml.template +++ b/template/docker-compose.yaml.template @@ -13,7 +13,6 @@ services: - timeline-network code-server: - image: crupest/arch-code-server:latest build: context: ./docker/arch-code-server dockerfile: Dockerfile @@ -23,6 +22,8 @@ services: - CRUPEST_UID=$CRUPEST_UID - CRUPEST_GID=$CRUPEST_GID - USE_CHINA_MIRROR=$CRUPEST_IN_CHINA + tags: + - "crupest/arch-code-server:latest" container_name: code-server restart: on-failure:3 volumes: @@ -31,12 +32,13 @@ services: - code-server-network nginx: - image: crupest/arch-code-server:latest pull_policy: build build: context: ./docker/crupest-nginx dockerfile: Dockerfile pull: true + tags: + - "crupest/arch-code-server:latest" container_name: nginx restart: on-failure:3 ports: @@ -54,12 +56,13 @@ services: - crupest-api-network crupest-api: - image: crupest/crupest-api:latest pull_policy: build build: context: ./docker/crupest-api dockerfile: Dockerfile pull: true + tags: + - "crupest/crupest-api:latest" container_name: crupest-api volumes: - "./crupest-api-config.json:/config.json:ro" @@ -67,7 +70,6 @@ services: - crupest-api-network auto-certbot: - image: crupest/auto-certbot:latest pull_policy: build depends_on: - nginx @@ -80,6 +82,8 @@ services: - CRUPEST_EMAIL=$CRUPEST_EMAIL - CRUPEST_AUTO_CERTBOT_ADDITIONAL_PACKAGES=docker-cli - CRUPEST_AUTO_CERTBOT_POST_HOOK=docker restart nginx + tags: + - "crupest/auto-certbot:latest" container_name: auto-certbot volumes: - "./data/certbot/certs:/etc/letsencrypt" @@ -92,7 +96,6 @@ services: - auto-certbot-network auto-backup: - image: crupest/auto-backup:latest pull_policy: build build: context: ./docker/auto-backup @@ -103,6 +106,8 @@ services: - CRUPEST_AUTO_BACKUP_COS_SECRET_KEY=${CRUPEST_AUTO_BACKUP_COS_SECRET_KEY} - CRUPEST_AUTO_BACKUP_COS_REGION=${CRUPEST_AUTO_BACKUP_COS_REGION} - CRUPEST_AUTO_BACKUP_BUCKET_NAME=${CRUPEST_AUTO_BACKUP_BUCKET_NAME} + tags: + - "crupest/auto-backup:latest" container_name: auto-backup volumes: - "./data:/data" |