Skip to content

Commit 338f148

Browse files
committed
Buildx
1 parent 74cdf78 commit 338f148

File tree

2 files changed

+7
-42
lines changed

2 files changed

+7
-42
lines changed

.github/workflows/build.yaml

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -30,47 +30,12 @@ jobs:
3030
- name: Generate release notes
3131
run:
3232
./gen-rel-notes.sh > CHANGELOG
33-
34-
- name: Cache Docker layers
35-
uses: actions/cache@v4
36-
with:
37-
path: /tmp/.buildx-cache-app
38-
key: ${{ runner.os }}-buildx-app-${{ github.sha }}
39-
restore-keys: |
40-
${{ runner.os }}-buildx-app
41-
42-
# - name: Prepare for buildx
43-
# run: |
44-
# cp tdei_uw.env .env
45-
# echo "CODE_VERSION=${CODE_VERSION}" >> .env
46-
47-
# - name: Build and push
48-
# uses: docker/[email protected]
49-
# env:
50-
# ENV: ${{ vars.ENV }}
51-
# WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
52-
#
53-
# # passwords
54-
# WS_API_DB_PASS: ${{ secrets.WS_API_DB_PASS }}
55-
# WS_MAPBOX_ACCESS_TOKEN: ${{ secrets.WS_MAPBOX_ACCESS_TOKEN }}
56-
# WS_OSM_DB_PASS: ${{ secrets.WS_OSM_DB_PASS }}
57-
# WS_OSM_SECRET_KEY_BASE: ${{ secrets.WS_OSM_SECRET_KEY_BASE }}
58-
# WS_SMTP_PASS: ${{ secrets.WS_SMTP_PASS }}
59-
# WS_TASKS_DB_PASS: ${{ secrets.WS_TASKS_DB_PASS }}
60-
# WS_TASKS_SECRET_KEY: ${{ secrets.WS_TASKS_SECRET_KEY }}
61-
# with:
62-
# files: docker-buildx.build.hcl
63-
# push: true
64-
# set: |
65-
# *.cache-from=type=local,src=/tmp/.buildx-cache
66-
# *.cache-to=type=local,mode=max,dest=/tmp/.buildx-cache-new
67-
# allow: "fs=/tmp"
68-
33+
6934
- name: Build and push
7035
run: |
7136
cp tdei_uw.env .env
7237
echo "CODE_VERSION=${CODE_VERSION}" >> .env
73-
docker buildx bake --allow=fs=/tmp --file docker-buildx.build.hcl --set *.cache-from=type=local,src=/tmp/.buildx-cache --set *.cache-to=type=local,mode=max,dest=/tmp/.buildx-cache-new --push
38+
docker buildx bake --file docker-buildx.build.hcl --push
7439
env:
7540
ENV: ${{ vars.ENV }}
7641
WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
@@ -84,11 +49,6 @@ jobs:
8449
WS_TASKS_DB_PASS: ${{ secrets.WS_TASKS_DB_PASS }}
8550
WS_TASKS_SECRET_KEY: ${{ secrets.WS_TASKS_SECRET_KEY }}
8651

87-
- name: Prepare cache
88-
run: |
89-
rm -rf /tmp/.buildx-cache-app # Remove the old cache.
90-
mv /tmp/.buildx-cache-app-new /tmp/.buildx-cache-app # Move the new cache to replace the old cache.
91-
9252
- name: Deploy
9353
env:
9454
ENV: ${{ vars.ENV }}

docker-buildx.build.hcl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ target "frontend" {
4040
"${WS_DOCKER_REGISTRY}/workspaces-frontend:${ENV}",
4141
"${WS_DOCKER_REGISTRY}/workspaces-frontend:${CODE_VERSION}"
4242
]
43+
cache-to = [
44+
"type=inline"
45+
]
46+
47+
4348
}
4449

4550
target "osm-cgimap" {

0 commit comments

Comments
 (0)