Skip to content

Commit 0b5dccc

Browse files
committed
fix docker build
1 parent 68b4bb5 commit 0b5dccc

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Dockerfile.alpine

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM alpine
22

33
WORKDIR /usr/src/oxyromon
44
COPY . .
5-
RUN apk add --no-cache bchunk build-base dolphin-emu musl-dev 7zip rustup yarn && \
5+
RUN apk add --no-cache build-base dolphin-emu musl-dev 7zip rustup yarn && \
66
rustup-init -y && \
77
source /root/.cargo/env && \
88
cargo install \

docker.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22

3-
version=$(tomlq .package.version Cargo.toml)
4-
sudo docker build -t alucryd/oxyromon:"${version//\"/}" -t alucryd/oxyromon:latest -f Dockerfile.archlinux .
5-
sudo docker build -t alucryd/oxyromon:"${version//\"/}"-alpine -t alucryd/oxyromon:alpine -f Dockerfile.alpine .
6-
sudo docker push alucryd/oxyromon:"${version//\"/}"
3+
version=$(tomlq .package.version Cargo.toml | sed 's/"//g')
4+
sudo docker build -t alucryd/oxyromon:${version} -t alucryd/oxyromon:latest -f Dockerfile.archlinux .
5+
sudo docker build -t alucryd/oxyromon:${version}-alpine -t alucryd/oxyromon:alpine -f Dockerfile.alpine .
6+
sudo docker push alucryd/oxyromon:${version}
77
sudo docker push alucryd/oxyromon:latest
8-
sudo docker push alucryd/oxyromon:"${version//\"/}"-alpine
8+
sudo docker push alucryd/oxyromon:${version}-alpine
99
sudo docker push alucryd/oxyromon:alpine

0 commit comments

Comments
 (0)