Skip to content

Commit b6ea178

Browse files
PastaPastaPastaPastaPastaPasta
committed
Merge #6586: fix: revert deployment images back to Ubuntu 22.04 LTS (jammy), pin QEMU to avoid segfault
20524e4 fix: pin version of QEMU to avoid segfault (Kittywhiskers Van Gogh) c8ab705 revert: update containers and CI to use Ubuntu 24.04 LTS (`noble`) (Kittywhiskers Van Gogh) 2bcc90a revert: use default non-root user `ubuntu` introduced in Ubuntu 22.10 (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * There is a regression in `noble` that has caused a build failure in trying to package our release container ([build](https://github.com/dashpay/dash/actions/runs/13376032021)) linked to [docker/setup-qemu-action#198](docker/setup-qemu-action#198). * In light of this, all non-CI containers and jobs have been moved back to Ubuntu 22.04 (`jammy`) though it seems that downgrading alone may be insufficient (see [actions/runner-images#11471](actions/runner-images#11471 (comment))). * To remedy this we are pinning the version of QEMU as suggested in [tonistiigi/binfmt#240](tonistiigi/binfmt#240 (comment)) ## Checklist: - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)** - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 20524e4 Tree-SHA512: 26bb2cd55a0267b56f86938d97ddfa32f0cdd8a2786c0366eedbcddf706e38b6af93cd29ab98ba420cbdbd112561ded61e2dba906c4b233ad737f24730f58ddc
2 parents 0e9105e + 20524e4 commit b6ea178

File tree

4 files changed

+31
-24
lines changed

4 files changed

+31
-24
lines changed

‎.github/workflows/release_docker_hub.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ on:
77
jobs:
88
release:
99
name: Release to Docker Hub
10-
runs-on: ubuntu-24.04
10+
runs-on: ubuntu-22.04
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v3
1414

1515
- name: Set up QEMU
16-
uses: docker/setup-qemu-action@v2
16+
uses: docker/setup-qemu-action@v3
17+
with:
18+
image: tonistiigi/binfmt:qemu-v7.0.0-28
1719

1820
- name: Set up Docker Buildx
1921
uses: docker/setup-buildx-action@v2

‎contrib/containers/deploy/Dockerfile‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
FROM phusion/baseimage:noble-1.0.0
1+
FROM phusion/baseimage:jammy-1.0.4
22
LABEL maintainer="Dash Developers <[email protected]>"
33
LABEL description="Dockerised DashCore, built from CI"
44

5-
# Setup unprivileged user
6-
ARG USER_ID=1000 \
7-
GROUP_ID=1000
8-
RUN groupmod -g ${GROUP_ID} -n dash ubuntu; \
9-
usermod -u ${USER_ID} -md /home/dash -l dash ubuntu; \
10-
mkdir -p /home/dash/.dashcore && \
5+
ARG USER_ID
6+
ARG GROUP_ID
7+
8+
ENV HOME="/home/dash"
9+
10+
# add user with specified (or default) user/group ids
11+
ENV USER_ID="${USER_ID:-1000}"
12+
ENV GROUP_ID="${GROUP_ID:-1000}"
13+
RUN groupadd -g ${GROUP_ID} dash && \
14+
useradd -u ${USER_ID} -g dash -s /bin/bash -m -d /home/dash dash && \
15+
mkdir /home/dash/.dashcore && \
1116
chown ${USER_ID}:${GROUP_ID} -R /home/dash
1217

1318
COPY bin/* /usr/local/bin/

‎contrib/containers/deploy/Dockerfile.GitHubActions.Dispatch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1.3
22

3-
FROM --platform=$BUILDPLATFORM ubuntu:noble as builder
3+
FROM --platform=$BUILDPLATFORM ubuntu:jammy as builder
44
RUN apt-get update && \
55
apt-get -y install --no-install-recommends \
66
automake \
@@ -42,7 +42,7 @@ RUN mkdir built-target && \
4242
"linux/amd64") cp depends/x86_64-pc-linux-gnu/bin/dash* /home/dash/built-target ;; \
4343
esac
4444

45-
FROM ubuntu:noble
45+
FROM ubuntu:jammy
4646
LABEL maintainer="Dash Developers <[email protected]>"
4747
LABEL description="Dockerised DashCore"
4848

@@ -52,12 +52,12 @@ ARG TAG
5252

5353
ENV HOME="/home/dash"
5454

55-
# Setup unprivileged user
56-
ARG USER_ID=1000 \
57-
GROUP_ID=1000
58-
RUN groupmod -g ${GROUP_ID} -n dash ubuntu; \
59-
usermod -u ${USER_ID} -md /home/dash -l dash ubuntu; \
60-
mkdir -p /home/dash/.dashcore && \
55+
# add user with specified (or default) user/group ids
56+
ENV USER_ID="${USER_ID:-1000}"
57+
ENV GROUP_ID="${GROUP_ID:-1000}"
58+
RUN groupadd -g ${GROUP_ID} dash && \
59+
useradd -u ${USER_ID} -g dash -s /bin/bash -m -d /home/dash dash && \
60+
mkdir /home/dash/.dashcore && \
6161
chown ${USER_ID}:${GROUP_ID} -R /home/dash
6262

6363
RUN apt-get update && \

‎contrib/containers/deploy/Dockerfile.GitHubActions.Release‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:noble
1+
FROM ubuntu:jammy
22
LABEL maintainer="Dash Developers <[email protected]>"
33
LABEL description="Dockerised DashCore"
44

@@ -9,12 +9,12 @@ ARG GITHUB_REPOSITORY
99

1010
ENV HOME /home/dash
1111

12-
# Setup unprivileged user
13-
ARG USER_ID=1000 \
14-
GROUP_ID=1000
15-
RUN groupmod -g ${GROUP_ID} -n dash ubuntu; \
16-
usermod -u ${USER_ID} -md /home/dash -l dash ubuntu; \
17-
mkdir -p /home/dash/.dashcore && \
12+
# add user with specified (or default) user/group ids
13+
ENV USER_ID ${USER_ID:-1000}
14+
ENV GROUP_ID ${GROUP_ID:-1000}
15+
RUN groupadd -g ${GROUP_ID} dash && \
16+
useradd -u ${USER_ID} -g dash -s /bin/bash -m -d /home/dash dash && \
17+
mkdir /home/dash/.dashcore && \
1818
chown ${USER_ID}:${GROUP_ID} -R /home/dash
1919

2020
RUN apt-get update && \

0 commit comments

Comments
 (0)