Skip to content

Commit 9a401e1

Browse files
author
Your Name
committed
dind
1 parent 1e534da commit 9a401e1

File tree

2 files changed

+149
-29
lines changed

2 files changed

+149
-29
lines changed

‎.github/workflows/test-update.yml‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
name: Build & Update with Arduino CLI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- test_package_update
8+
workflow_dispatch:
9+
10+
permissions:
11+
contents: read
12+
13+
jobs:
14+
build-and-update:
15+
runs-on: ubuntu-22.04
16+
# services:
17+
# docker:
18+
# image: docker:dind
19+
# options: --privileged --shm-size=2g
20+
# volumes:
21+
# - /var/run/docker.sock:/var/run/docker.sock:ro
22+
# container:
23+
# image: ubuntu:latest
24+
25+
env:
26+
ARCH: amd64
27+
APPCLI_REPO: arduino/arduino-app-cli
28+
ROUTER_REPO: arduino/arduino-router
29+
# ---- Configure what to fetch ----
30+
# Use a specific tag (with leading v) or leave empty to use the latest stable release.
31+
APPCLI_TAG: v0.6.6 # or "" to auto-use latest
32+
APPCLI_REGEX: "amd64\\.deb$" # choose the matching asset (regex)
33+
34+
ROUTER_TAG: v0.5.3 # or "" to auto-use latest
35+
ROUTER_REGEX: "amd64\\.deb$" # e.g. change to "arm64\\.deb$" if you need arm64
36+
37+
steps:
38+
- name: Checkout
39+
uses: actions/checkout@v4
40+
41+
# - name: Set up Go
42+
# uses: actions/setup-go@v5
43+
# with:
44+
# go-version-file: go.mod
45+
46+
# - name: Set up Docker
47+
# uses: docker/setup-docker-action@v2
48+
49+
# - name: Set up Docker Buildx
50+
# uses: docker/setup-buildx-action@v3
51+
52+
# - name: Install Task (go-task)
53+
# run: |
54+
# go tool task --version
55+
- name: Checkout
56+
uses: actions/checkout@v4
57+
58+
- name: Set up Go
59+
uses: actions/setup-go@v5
60+
with:
61+
go-version-file: go.mod
62+
63+
- name: Build deb
64+
run: |
65+
go tool task build-deb VERSION=${TAG_VERSION} ARCH=${{ matrix.arch }} RELEASE="true"
66+
67+
- name: Fetch .debs dynamically into build/stable
68+
env:
69+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
70+
run: |
71+
set -euo pipefail
72+
mkdir -p build/stable
73+
74+
fetch_deb () {
75+
local repo="$1" tag="${2:-}" regex="$3"
76+
77+
echo "==> Resolving release for ${repo} (tag='${tag:-<latest>}')"
78+
if [ -n "${tag}" ]; then
79+
url="https://api.github.com/repos/${repo}/releases/tags/${tag}"
80+
else
81+
url="https://api.github.com/repos/${repo}/releases/latest"
82+
fi
83+
84+
rel="$(curl -sfL -H "Authorization: token ${GH_TOKEN}" -H "Accept: application/vnd.github+json" "${url}")"
85+
86+
name="$(echo "$rel" | jq -r --arg re "${regex}" '.assets[] | select(.name | test($re)) | .name' | head -n1)"
87+
dl="$(echo "$rel" | jq -r --arg re "${regex}" '.assets[] | select(.name | test($re)) | .browser_download_url' | head -n1)"
88+
89+
if [ -z "${name}" ] || [ "${name}" = "null" ] || [ -z "${dl}" ] || [ "${dl}" = "null" ]; then
90+
echo "!! No asset found in ${repo} matching regex: ${regex}"
91+
echo " Available assets:"
92+
echo "$rel" | jq -r '.assets[].name'
93+
exit 1
94+
fi
95+
96+
echo "Found: ${name}"
97+
echo "Downloading: ${dl}"
98+
99+
curl -sfL -H "Authorization: token ${GH_TOKEN}" \
100+
-o "build/stable/${name}" \
101+
"${dl}"
102+
103+
ls -lh "build/stable/${name}"
104+
}
105+
106+
fetch_deb "${APPCLI_REPO}" "${APPCLI_TAG}" "${APPCLI_REGEX}"
107+
fetch_deb "${ROUTER_REPO}" "${ROUTER_TAG}" "${ROUTER_REGEX}"
108+
109+
echo "✅ Downloaded files:"
110+
ls -lh build/stable/
111+
112+
- name: Build Docker image (no cache)
113+
run: |
114+
docker build --no-cache -t mock-apt-repo -f test.Dockerfile .
115+
116+
- name: Run mock-apt-repo container
117+
run: |
118+
docker run --rm -d \
119+
--privileged \
120+
--cgroupns=host \
121+
-v /sys/fs/cgroup:/sys/fs/cgroup:rw \
122+
-v /var/run/docker.sock:/var/run/docker.sock \
123+
-e DOCKER_HOST=unix:///var/run/docker.sock \
124+
--name apt-test-update \
125+
mock-apt-repo
126+
127+
- name: Verify container is running
128+
run: docker ps

‎test.Dockerfile‎

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,38 @@
11
FROM debian:trixie
22

3-
ENV container docker
4-
STOPSIGNAL SIGRTMIN+3
5-
VOLUME ["/sys/fs/cgroup"]
6-
7-
# Install systemd + dependencies
8-
RUN apt update && apt install -y systemd systemd-sysv dbus \
9-
dpkg-dev apt-utils adduser gzip \
10-
&& rm -rf /var/lib/apt/lists/*
11-
12-
# Copy your packages and setup repo (as before)
13-
ARG OLD_PACKAGE_PATH=build/old_package
14-
ARG NEW_PACKAGE_PATH=build
15-
ARG APP_PACKAGE_NAME=arduino-app-cli
16-
ARG ROUTER_PACKAGE_NAME=arduino-router
17-
ARG ARCH=arm64
18-
19-
COPY ${OLD_PACKAGE_PATH}/${APP_PACKAGE_NAME}*.deb /tmp/old_app.deb
20-
COPY ${NEW_PACKAGE_PATH}/${APP_PACKAGE_NAME}*.deb /tmp/new_app.deb
21-
COPY ${NEW_PACKAGE_PATH}/${ROUTER_PACKAGE_NAME}*.deb /tmp/new_router.deb
22-
23-
RUN apt update && apt install -y /tmp/old_app.deb /tmp/new_router.deb \
24-
&& rm /tmp/old_app.deb \
3+
RUN apt update && \
4+
apt install -y systemd systemd-sysv dbus \
5+
sudo docker.io ca-certificates curl gnupg \
6+
dpkg-dev apt-utils adduser gzip && \
7+
rm -rf /var/lib/apt/lists/*
8+
9+
ARG ARCH=amd64
10+
11+
COPY build/stable/arduino-app-cli*.deb /tmp/stable.deb
12+
COPY build/arduino-app-cli*.deb /tmp/unstable.deb
13+
COPY build/stable/arduino-router*.deb /tmp/router.deb
14+
15+
16+
RUN apt update && apt install -y /tmp/stable.deb /tmp/router.deb \
17+
&& rm /tmp/stable.deb /tmp/router.deb \
2518
&& mkdir -p /var/www/html/myrepo/dists/trixie/main/binary-${ARCH} \
26-
&& mv /tmp/new_app.deb /var/www/html/myrepo/dists/trixie/main/binary-${ARCH}/ \
27-
&& mv /tmp/new_router.deb /var/www/html/myrepo/dists/trixie/main/binary-${ARCH}/
19+
&& mv /tmp/unstable.deb /var/www/html/myrepo/dists/trixie/main/binary-${ARCH}/
2820

2921
WORKDIR /var/www/html/myrepo
3022
RUN dpkg-scanpackages dists/trixie/main/binary-${ARCH} /dev/null | gzip -9c > dists/trixie/main/binary-${ARCH}/Packages.gz
3123
WORKDIR /
3224

25+
26+
3327
RUN usermod -s /bin/bash arduino || true
3428
RUN mkdir -p /home/arduino && chown -R arduino:arduino /home/arduino
29+
RUN usermod -aG docker arduino
30+
3531

3632

3733
RUN echo "deb [trusted=yes arch=${ARCH}] file:/var/www/html/myrepo trixie main" \
3834
> /etc/apt/sources.list.d/my-mock-repo.list
3935

4036

41-
VOLUME [ "/sys/fs/cgroup" ]
42-
43-
44-
4537
# CMD: systemd must be PID 1
46-
CMD ["/sbin/init"]
38+
CMD ["/sbin/init"]

0 commit comments

Comments
 (0)