From 3a4d1bff5be29a9b67118c92f485fd7f26ff6008 Mon Sep 17 00:00:00 2001 From: steebchen Date: Mon, 25 Dec 2023 01:09:35 +0700 Subject: [PATCH] ci(dockerfiles): minor improvements & rename to .dockerfile --- .github/workflows/pre-release.yaml | 10 +++++----- .../{frontend.Dockerfile => frontend.dockerfile} | 2 +- build/package/migrate.Dockerfile | 16 ---------------- build/package/migrate.dockerfile | 14 ++++++++++++++ .../{servers.Dockerfile => servers.dockerfile} | 4 +--- 5 files changed, 21 insertions(+), 25 deletions(-) rename build/package/{frontend.Dockerfile => frontend.dockerfile} (96%) delete mode 100644 build/package/migrate.Dockerfile create mode 100644 build/package/migrate.dockerfile rename build/package/{servers.Dockerfile => servers.dockerfile} (96%) diff --git a/.github/workflows/pre-release.yaml b/.github/workflows/pre-release.yaml index fa8f5f8c7..43c4146f9 100644 --- a/.github/workflows/pre-release.yaml +++ b/.github/workflows/pre-release.yaml @@ -20,7 +20,7 @@ jobs: run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - name: Build run: | - DOCKER_BUILDKIT=1 docker build -f ./build/package/servers.Dockerfile \ + DOCKER_BUILDKIT=1 docker build -f ./build/package/servers.dockerfile \ -t ghcr.io/hatchet-dev/hatchet/hatchet-api:${{steps.tag_name.outputs.tag}} \ --build-arg SERVER_TARGET=api \ --build-arg VERSION=${{steps.tag_name.outputs.tag}} \ @@ -44,7 +44,7 @@ jobs: run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - name: Build run: | - DOCKER_BUILDKIT=1 docker build -f ./build/package/servers.Dockerfile \ + DOCKER_BUILDKIT=1 docker build -f ./build/package/servers.dockerfile \ -t ghcr.io/hatchet-dev/hatchet/hatchet-admin:${{steps.tag_name.outputs.tag}} \ --build-arg SERVER_TARGET=admin \ --build-arg VERSION=${{steps.tag_name.outputs.tag}} \ @@ -68,7 +68,7 @@ jobs: run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - name: Build run: | - DOCKER_BUILDKIT=1 docker build -f ./build/package/servers.Dockerfile \ + DOCKER_BUILDKIT=1 docker build -f ./build/package/servers.dockerfile \ -t ghcr.io/hatchet-dev/hatchet/hatchet-engine:${{steps.tag_name.outputs.tag}} \ --build-arg SERVER_TARGET=engine \ --build-arg VERSION=${{steps.tag_name.outputs.tag}} \ @@ -92,7 +92,7 @@ jobs: run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - name: Build run: | - DOCKER_BUILDKIT=1 docker build -f ./build/package/migrate.Dockerfile \ + DOCKER_BUILDKIT=1 docker build -f ./build/package/migrate.dockerfile \ -t ghcr.io/hatchet-dev/hatchet/hatchet-migrate:${{steps.tag_name.outputs.tag}} \ . - name: Push to GHCR @@ -114,7 +114,7 @@ jobs: run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - name: Build run: | - DOCKER_BUILDKIT=1 docker build -f ./build/package/frontend.Dockerfile \ + DOCKER_BUILDKIT=1 docker build -f ./build/package/frontend.dockerfile \ -t ghcr.io/hatchet-dev/hatchet/hatchet-frontend:${{steps.tag_name.outputs.tag}} \ . - name: Push to GHCR diff --git a/build/package/frontend.Dockerfile b/build/package/frontend.dockerfile similarity index 96% rename from build/package/frontend.Dockerfile rename to build/package/frontend.dockerfile index 4d930924f..dd954b00a 100644 --- a/build/package/frontend.Dockerfile +++ b/build/package/frontend.dockerfile @@ -2,7 +2,7 @@ FROM node:18-alpine as build WORKDIR /app COPY ./frontend/app/package.json ./frontend/app/package-lock.json ./ -RUN npm install +RUN npm ci COPY ./frontend/app ./ RUN npm run build diff --git a/build/package/migrate.Dockerfile b/build/package/migrate.Dockerfile deleted file mode 100644 index 183de9746..000000000 --- a/build/package/migrate.Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -# Base Go environment -# ------------------- -FROM golang:1.21-alpine as base -WORKDIR /hatchet - -RUN apk update && apk add --no-cache gcc musl-dev git - -COPY go.mod go.sum ./ -COPY /prisma ./prisma - -RUN go install github.com/steebchen/prisma-client-go@v0.31.2 - -# prefetch the binaries, so that they will be cached and not downloaded on each change -RUN go run github.com/steebchen/prisma-client-go prefetch - -CMD go run github.com/steebchen/prisma-client-go migrate deploy \ No newline at end of file diff --git a/build/package/migrate.dockerfile b/build/package/migrate.dockerfile new file mode 100644 index 000000000..46d95c931 --- /dev/null +++ b/build/package/migrate.dockerfile @@ -0,0 +1,14 @@ +# Base Go environment +# ------------------- +FROM golang:1.21-alpine as base +WORKDIR /hatchet + +COPY go.mod go.sum ./ + +RUN go mod download + +RUN go run github.com/steebchen/prisma-client-go prefetch + +COPY /prisma ./prisma + +CMD go run github.com/steebchen/prisma-client-go migrate deploy diff --git a/build/package/servers.Dockerfile b/build/package/servers.dockerfile similarity index 96% rename from build/package/servers.Dockerfile rename to build/package/servers.dockerfile index efed0737a..7aa8fa10a 100644 --- a/build/package/servers.Dockerfile +++ b/build/package/servers.dockerfile @@ -32,9 +32,7 @@ RUN go run github.com/steebchen/prisma-client-go generate --generator go FROM node:16-alpine as build-openapi WORKDIR /openapi -RUN npm install -g npm@8.1 - -RUN npm install -g @apidevtools/swagger-cli prisma +RUN npm install -g npm@8.1 @apidevtools/swagger-cli prisma COPY /api-contracts/openapi ./openapi