aharrison-fuller/mumble_docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move to buildargs

Browse Source
This commit is contained in:
aharrison-fuller
2019-03-05 21:59:50 +00:00
parent a2ad9822ad
commit 0eaf7c6467
4 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+7 -3
View File
@@ -1,6 +1,9 @@
FROM arm64v8/debian:stretch-slim ARG docker_arch=amd64
FROM $docker_arch/debian:stretch-slim
ARG qemu_arch="./qemu-x86_64-static"
ARG docker_arch=amd64
MAINTAINER Adam Harrison-Fuller <adam@adamhf.io> MAINTAINER Adam Harrison-Fuller <adam@adamhf.io>
COPY qemu-aarch64-static /usr/bin/ COPY ${qemu_arch} /usr/bin/
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y mumble-server && \ apt-get install -y mumble-server && \
@@ -10,7 +13,8 @@ RUN apt-get update && \
EXPOSE 64738 64738/udp EXPOSE 64738 64738/udp
ADD ./data/mumble_server.ini /config/ ADD ./data/mumble_server.ini /config-orig/
RUN mkdir /config
VOLUME /data VOLUME /data
ENV MUMBLE_INI /config/mumble_server.ini ENV MUMBLE_INI /config/mumble_server.ini
README.md
+1 -1
View File
@@ -7,7 +7,7 @@ A lean mumble container with mumble version 1.2.18, from Debian Stretch-Lite
to setup SuperUser password, change your run command from the default: to setup SuperUser password, change your run command from the default:
``` ```
docker run -ti --rm adamhf/mumble_arm -supw supersecret docker run -ti --rm adamhf/mumble -supw supersecret
mumble-server does not own /data, attempting to modify mumble-server does not own /data, attempting to modify
Failed to set initial capabilities Failed to set initial capabilities
<W>2014-12-15 04:37:27.398 Initializing settings from /data/mumble_server.ini (basepath /data) <W>2014-12-15 04:37:27.398 Initializing settings from /data/mumble_server.ini (basepath /data)
build.sh
+11 -16
View File
@@ -1,5 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
docker run --rm --privileged multiarch/qemu-user-static:register --reset docker run --rm --privileged multiarch/qemu-user-static:register --reset
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
@@ -12,20 +11,16 @@ for docker_arch in amd64 arm32v7 arm64v8; do
wget -N https://github.com/multiarch/qemu-user-static/releases/download/v3.1.0-2/x86_64_qemu-${qemu_arch}-static.tar.gz wget -N https://github.com/multiarch/qemu-user-static/releases/download/v3.1.0-2/x86_64_qemu-${qemu_arch}-static.tar.gz
tar -xvf x86_64_qemu-${qemu_arch}-static.tar.gz tar -xvf x86_64_qemu-${qemu_arch}-static.tar.gz
cat Dockerfile.cross | \ docker build \
sed -e "s|__BASEIMAGE_ARCH__|${docker_arch}|g" | \ -f Dockerfile \
sed -e "s|__QEMU_ARCH__|${qemu_arch}|g" > Dockerfile.${docker_arch} --build-arg docker_arch=${docker_arch} \
if [ ${docker_arch} == "amd64" ]; then --build-arg qemu_arch=./qemu-${qemu_arch}-static \
sed -i -e "/__CROSS_/d" Dockerfile.${docker_arch} -t adamhf/mumble:${docker_arch}-latest \
else .
sed -i -e "s/__CROSS_//g" Dockerfile.${docker_arch} docker push adamhf/mumble:${docker_arch}-latest
fi
docker build -f Dockerfile.${docker_arch} -t adamhf/mumble_arm:${docker_arch}-latest .
docker push adamhf/mumble_arm:${docker_arch}-latest
done done
docker manifest create --amend adamhf/mumble_arm:latest adamhf/mumble_arm:amd64-latest adamhf/mumble_arm:arm32v7-latest adamhf/mumble_arm:arm64v8-latest docker manifest create --amend adamhf/mumble:latest adamhf/mumble:amd64-latest adamhf/mumble:arm32v7-latest adamhf/mumble:arm64v8-latest
docker manifest annotate adamhf/mumble_arm:latest adamhf/mumble_arm:arm32v7-latest --os linux --arch arm --variant v7 docker manifest annotate adamhf/mumble:latest adamhf/mumble:arm32v7-latest --os linux --arch arm --variant v7
docker manifest annotate adamhf/mumble_arm:latest adamhf/mumble_arm:arm64v8-latest --os linux --arch arm64 --variant v8 docker manifest annotate adamhf/mumble:latest adamhf/mumble:arm64v8-latest --os linux --arch arm64 --variant v8
docker manifest push adamhf/mumble_arm:latest docker manifest push adamhf/mumble:latest
entrypoint.sh
+6
View File
@@ -7,6 +7,12 @@ if [ "$(stat -c %U /data)" != "mumble-server" ] ; then
chown -R mumble-server.mumble-server /data chown -R mumble-server.mumble-server /data
fi; fi;
if [ ! -f /config/mumble_server.ini ]; then
echo "No config file found in /config, copying in default file"
cp /config-orig/mumble_server.ini /config/
chown -R mumble-server.mumble-server /config
fi
OPTS="-ini $MUMBLE_INI" OPTS="-ini $MUMBLE_INI"
exec murmurd $OPTS $@ exec murmurd $OPTS $@