Skip to content

Commit 6f35e5b

Browse files
committed
Update podman
1 parent 1e1b2b0 commit 6f35e5b

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.github/workflows/build_and_test_debug.yml

+5
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ jobs:
3838
runs-on: ubuntu-latest
3939
needs: lint
4040
steps:
41+
- name: Setup Podman
42+
run: |
43+
sudo apt update
44+
sudo apt-get -y install podman
45+
4146
- name: Checkout
4247
uses: actions/checkout@v2.3.4
4348

src/shadowbox/docker/build.action.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ readonly NODE_IMAGE=$(
3535
fi
3636
)
3737

38-
buildah build --layers --force-rm \
38+
podman build --force-rm \
3939
--os "linux" \
4040
--arch "${ARCH}" \
4141
--build-arg ARCH="${ARCH}" \

src/shadowbox/integration_test/test.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ function setup() {
9595
podman network create -d bridge --internal "${NET_BLOCKED}"
9696

9797
# Target service.
98-
buildah build --force-rm -t "${TARGET_IMAGE}" ./target
98+
podman build --force-rm -t "${TARGET_IMAGE}" ./target
9999
podman run -d --rm -p "10080:80" --network="${NET_OPEN}" --network-alias="target" --name="${TARGET_CONTAINER}" "${TARGET_IMAGE}"
100100

101101
# Shadowsocks service.
@@ -121,12 +121,12 @@ function setup() {
121121
podman network connect "${NET_OPEN}" "${SHADOWBOX_CONTAINER}"
122122

123123
# Client service.
124-
buildah build --force-rm -t "${CLIENT_IMAGE}" ./client
124+
podman build --force-rm -t "${CLIENT_IMAGE}" ./client
125125
# Use -i to keep the container running.
126126
podman run -d --rm -it -p "30555:555" --network "${NET_BLOCKED}" --name "${CLIENT_CONTAINER}" "${CLIENT_IMAGE}"
127127

128128
# Util service.
129-
buildah build --force-rm -t "${UTIL_IMAGE}" ./util
129+
podman build --force-rm -t "${UTIL_IMAGE}" ./util
130130
# Use -i to keep the container running.
131131
podman run -d --rm -it --network none --name "${UTIL_CONTAINER}" "${UTIL_IMAGE}"
132132
}

0 commit comments

Comments
 (0)