Skip to content

Commit e81314e

Browse files
authored
chore: cherry pick to fix Docker build image workflows (#3631)
* Cherry pick 2a36104 Signed-off-by: Luis Mastrangelo <[email protected]> * chore: Update setup-buildx action and Qemu (#3628) * chore: Update setup-buildx action and Qemu **Description**: Sets qemu to a specific flavor Updates setup-build-x-action to v 3.10.0 Updates driver-opts Signed-off-by: Roger Barker <[email protected]> * Update setup-qemu-action to v3.3.0 Signed-off-by: Roger Barker <[email protected]> --------- Signed-off-by: Roger Barker <[email protected]> Signed-off-by: Luis Mastrangelo <[email protected]> --------- Signed-off-by: Luis Mastrangelo <[email protected]> Signed-off-by: Roger Barker <[email protected]>
1 parent 87584a2 commit e81314e

File tree

5 files changed

+27
-22
lines changed

5 files changed

+27
-22
lines changed

.github/workflows/charts.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,16 @@ jobs:
7373
timeout-minutes: 3
7474

7575
- name: Set up Docker Qemu
76-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
76+
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
7777

7878
- name: Set up Docker Buildx
79-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
79+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
8080
with:
81+
version: v0.16.2
8182
driver-opts: network=host
83+
buildkitd-config-inline: |
84+
[registry."docker.io"]
85+
mirrors = ["https://hub.mirror.docker.lat.ope.eng.hashgraph.io"]
8286
8387
- name: Build and push images
8488
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0

.github/workflows/image-build.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ on:
44
pull_request:
55
branches: [main, release/**]
66

7-
env:
8-
OWNER: hashgraph
9-
107
permissions:
118
contents: read
129

@@ -24,12 +21,16 @@ jobs:
2421
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
2522

2623
- name: Set up Docker Qemu
27-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
24+
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
2825

2926
- name: Set up Docker Buildx
30-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
27+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
3128
with:
29+
version: v0.16.2
3230
driver-opts: network=host
31+
buildkitd-config-inline: |
32+
[registry."docker.io"]
33+
mirrors = ["https://hub.mirror.docker.lat.ope.eng.hashgraph.io"]
3334
3435
- name: Build image
3536
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0

.github/workflows/release-integration.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
workflow_dispatch:
77

88
env:
9-
OWNER: hashgraph
109
REGISTRY: ghcr.io
1110

1211
permissions:
@@ -25,7 +24,7 @@ jobs:
2524

2625
- name: Checkout repository
2726
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
28-
27+
2928
- name: Login to GitHub Container Registry
3029
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
3130
with:
@@ -34,18 +33,20 @@ jobs:
3433
password: ${{ secrets.GITHUB_TOKEN }}
3534

3635
- name: Set up Docker Qemu
37-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
36+
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
3837

3938
- name: Set up Docker Buildx
40-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
39+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
4140
with:
41+
version: v0.16.2
4242
driver-opts: network=host
43+
buildkitd-config-inline: |
44+
[registry."docker.io"]
45+
mirrors = ["https://hub.mirror.docker.lat.ope.eng.hashgraph.io"]
4346
4447
- name: Build and push images
4548
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
4649
with:
47-
cache-from: type=gha
48-
cache-to: type=gha,mode=max
4950
platforms: linux/amd64, linux/arm64
5051
push: true
5152
tags: ${{ env.REGISTRY }}/${{ github.repository }}:main

.github/workflows/release-production.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
tags: [ v* ]
66

77
env:
8-
OWNER: hashgraph
98
PACKAGE_NAME: hedera-json-rpc-relay
109
REGISTRY: ghcr.io
1110

@@ -37,12 +36,16 @@ jobs:
3736
password: ${{ secrets.GITHUB_TOKEN }}
3837

3938
- name: Set up Docker Qemu
40-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
39+
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
4140

4241
- name: Set up Docker Buildx
43-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
42+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
4443
with:
44+
version: v0.16.2
4545
driver-opts: network=host
46+
buildkitd-config-inline: |
47+
[registry."docker.io"]
48+
mirrors = ["https://hub.mirror.docker.lat.ope.eng.hashgraph.io"]
4649
4750
- name: Build and push images
4851
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0

Dockerfile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20-bullseye-slim
1+
FROM node:20-bookworm-slim
22

33
# Setup
44
ENV DEBIAN_FRONTEND=noninteractive
@@ -17,11 +17,7 @@ COPY lerna.json ./
1717
COPY --chown=node:node ./packages ./packages
1818

1919
# Install OS updates and required packages
20-
RUN apt-get update && \
21-
apt-get upgrade -y --no-install-recommends && \
22-
apt-get autoremove -y && \
23-
apt-get install --no-install-recommends build-essential -y wget make g++ python3 && \
24-
npm ci --only=production --ignore-scripts && \
20+
RUN npm ci --only=production --ignore-scripts && \
2521
npm cache clean --force --loglevel=error && \
2622
chown -R node:node . && \
2723
rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)