Update Dockerfile and workflow

mxdlzg · Jun 18, 2024 · b7fdec3 · b7fdec3
1 parent 1a95e99
commit b7fdec3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/docker-image-amd64.yml b/.github/workflows/docker-image-amd64.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: Save version info
         run: |
-          git describe --tags > VERSION  && cat VERSION
+          git describe --tags --always > VERSION  && cat VERSION
 
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
@@ -83,8 +83,6 @@ jobs:
         uses: docker/setup-buildx-action@v2
         with:
           driver-opts: network=host
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Build and push Docker images
         uses: docker/build-push-action@v3
@@ -93,3 +91,5 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
diff --git a/Dockerfile b/Dockerfile
@@ -6,15 +6,15 @@ COPY ./web .
 
 WORKDIR /web/default
 RUN npm install
-RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat VERSION) npm run build
+RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat /web/VERSION) npm run build
 
 WORKDIR /web/berry
 RUN npm install
-RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat VERSION) npm run build
+RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat /web/VERSION) npm run build
 
 WORKDIR /web/air
 RUN npm install
-RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat VERSION) npm run build
+RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat /web/VERSION) npm run build
 
 FROM golang AS builder2