Skip to content

Commit e223594

Browse files
author
Your Name
committed
dind
1 parent 1e534da commit e223594

File tree

2 files changed

+127
-26
lines changed

2 files changed

+127
-26
lines changed

.github/workflows/test-update.yml

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
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+
STABLE_DIR: build/stable
30+
31+
steps:
32+
- name: Checkout
33+
uses: actions/checkout@v4
34+
35+
- name: Set up Docker
36+
uses: docker/setup-docker-action@v2
37+
38+
- name: Set up Docker Buildx
39+
uses: docker/setup-buildx-action@v3
40+
41+
- name: Build Docker image (no cache)
42+
run: |
43+
docker build --no-cache -t mock-apt-repo -f test.Dockerfile .
44+
45+
- name: Ensure tools on runner
46+
run: |
47+
sudo apt-get update
48+
sudo apt-get install -y jq curl docker.io
49+
50+
- name: Install Task (go-task)
51+
run: |
52+
curl -sL https://taskfile.dev/install.sh | sh -s -- -d -b ./bin
53+
echo "$PWD/bin" >> $GITHUB_PATH
54+
task --version
55+
56+
- name: Prepare folder
57+
run: |
58+
mkdir -p "${STABLE_DIR}"
59+
60+
- name: Checkout
61+
uses: actions/checkout@v4
62+
63+
- name: Ensure curl & mkdir
64+
run: |
65+
sudo apt-get update
66+
sudo apt-get install -y curl
67+
mkdir -p "$STABLE_DIR"
68+
69+
# --- Arduino App CLI (.deb) ---
70+
- name: Download arduino-app-cli .deb (from hard-coded tag page)
71+
run: |
72+
set -euo pipefail
73+
BASE="https://github.com/arduino/arduino-app-cli"
74+
# Use the "expanded_assets" page for the tag to get direct links
75+
PAGE="$BASE/releases/expanded_assets/${TAG}"
76+
REL_URL=$(curl -fsSL "$PAGE" | grep -oE '/arduino/arduino-app-cli/releases/download/'"$TAG"'/[^"]+\.deb' | head -n1)
77+
test -n "$REL_URL"
78+
URL="https://github.com${REL_URL}"
79+
echo "Found asset: $URL"
80+
curl -fL "$URL" -o "$STABLE_DIR/arduino-app-cli_${TAG}.deb"
81+
ls -l "$STABLE_DIR"
82+
83+
# --- Arduino Router (.deb) ---
84+
- name: Download arduino-router .deb (from hard-coded tag page)
85+
run: |
86+
set -euo pipefail
87+
BASE="https://github.com/arduino/arduino-router"
88+
PAGE="$BASE/releases/expanded_assets/${TAG}"
89+
REL_URL=$(curl -fsSL "$PAGE" | grep -oE '/arduino/arduino-router/releases/download/'"$TAG"'/[^"]+\.deb' | head -n1)
90+
test -n "$REL_URL"
91+
URL="https://github.com${REL_URL}"
92+
echo "Found asset: $URL"
93+
curl -fL "$URL" -o "$STABLE_DIR/arduino-router_${TAG}.deb"
94+
ls -l "$STABLE_DIR"
95+
96+
97+
- name: Run mock-apt-repo container
98+
run: |
99+
docker run --rm -d \
100+
--privileged \
101+
--cgroupns=host \
102+
-v /sys/fs/cgroup:/sys/fs/cgroup:rw \
103+
-v /var/run/docker.sock:/var/run/docker.sock \
104+
-e DOCKER_HOST=unix:///var/run/docker.sock \
105+
--name apt-test-update \
106+
mock-apt-repo
107+
108+
- name: Verify container is running
109+
run: docker ps

test.Dockerfile

Lines changed: 18 additions & 26 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
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+
179
ARG ARCH=arm64
1810

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
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+
2215

23-
RUN apt update && apt install -y /tmp/old_app.deb /tmp/new_router.deb \
24-
&& rm /tmp/old_app.deb \
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)