diff --git a/Dockerfile b/Dockerfile index 91fcdd6d..345ba15a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:experimental +# syntax=docker/dockerfile:1 # build frontend FROM node:19-alpine as frontend diff --git a/Dockerfile.allinone b/Dockerfile.allinone index a64b95c0..1624b2b9 100644 --- a/Dockerfile.allinone +++ b/Dockerfile.allinone @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:experimental +# syntax=docker/dockerfile:1 # build frontend FROM node:19-alpine as frontend diff --git a/scripts/docker/Dockerfile.allinone-runner b/scripts/docker/Dockerfile.allinone-runner index b5528db6..b4b44e49 100644 --- a/scripts/docker/Dockerfile.allinone-runner +++ b/scripts/docker/Dockerfile.allinone-runner @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 FROM getmeili/meilisearch:v1.5 as meilisearch FROM redis:7.2-alpine diff --git a/scripts/docker/Dockerfile.backend-builder b/scripts/docker/Dockerfile.backend-builder index d6858ab1..30c75eaa 100644 --- a/scripts/docker/Dockerfile.backend-builder +++ b/scripts/docker/Dockerfile.backend-builder @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 FROM golang:1.21-alpine RUN apk --no-cache --no-progress add --virtual \ build-deps \ diff --git a/scripts/docker/Dockerfile.backend-runner b/scripts/docker/Dockerfile.backend-runner index cba2776e..5d197159 100644 --- a/scripts/docker/Dockerfile.backend-runner +++ b/scripts/docker/Dockerfile.backend-runner @@ -1,3 +1,4 @@ -FROM alpine:3.18 +# syntax=docker/dockerfile:1 +FROM alpine:3.19 ENV TZ=Asia/Shanghai RUN apk update && apk add --no-cache ca-certificates && update-ca-certificates diff --git a/scripts/docker/README.md b/scripts/docker/README.md index 7a374060..4bdf9bd2 100644 --- a/scripts/docker/README.md +++ b/scripts/docker/README.md @@ -1,7 +1,7 @@ ### Dockerfile builer pre-build images ```sh -docker build -t bitbus/paopao-ce-backend-builder:latest -f Dockerfile.backend-builder . -docker build -t bitbus/paopao-ce-backend-runner:latest -f Dockerfile.backend-runner . -docker build -t bitbus/paopao-ce-allinone-runner:latest -f scripts/docker/Dockerfile.allinone-runner . +docker buildx build -t bitbus/paopao-ce-backend-builder:latest -f Dockerfile.backend-builder . +docker buildx build -t bitbus/paopao-ce-backend-runner:latest -f Dockerfile.backend-runner . +cd ../../ && docker buildx build -t bitbus/paopao-ce-allinone-runner:latest -f scripts/docker/Dockerfile.allinone-runner . ``` \ No newline at end of file