Trez/docker-mods-uptime-kuma-timeout-fix
4
0
Fork 0
mirror of https://github.com/TrezOne/docker-mods-uptime-kuma-timeout-fix.git synced 2026-07-18 08:48:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #226 from linuxserver/universal-docker-in-docker-apt

Browse Source 
Standardize apt-get, update formatting
This commit is contained in:
Roxedus
2021-06-29 18:15:31 +02:00
committed by GitHub
parent b4956e94a0 5349a37388
commit ad317183f6
3 changed files with 59 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+20 -20
View File
@@ -13,26 +13,26 @@ FROM ghcr.io/linuxserver/docker-compose:arm64v8-${COMPOSE_ALPINE_TAG} as compose
FROM ghcr.io/linuxserver/baseimage-alpine:3.13 as buildstage FROM ghcr.io/linuxserver/baseimage-alpine:3.13 as buildstage
RUN \ RUN \
echo "**** install packages ****" && \ echo "**** install packages ****" && \
apk add --no-cache \ apk add --no-cache \
curl && \ curl && \
echo "**** retrieve latest version ****" && \ echo "**** retrieve latest version ****" && \
if [ -z ${DOCKER_RELEASE+x} ]; then \ if [ -z ${DOCKER_RELEASE+x} ]; then \
DOCKER_RELEASE=$(curl -sX GET "https://api.github.com/repos/moby/moby/releases/latest" \ DOCKER_RELEASE=$(curl -sX GET "https://api.github.com/repos/moby/moby/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]' \ | awk '/tag_name/{print $4;exit}' FS='[""]' \
| sed 's|^v||'); \ | sed 's|^v||'); \
fi && \ fi && \
echo "**** grab docker ****" && \ echo "**** grab docker ****" && \
mkdir -p /root-layer/docker-tgz && \ mkdir -p /root-layer/docker-tgz && \
curl -fo \ curl -fo \
/root-layer/docker-tgz/docker_x86_64.tgz -L \ /root-layer/docker-tgz/docker_x86_64.tgz -L \
"https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_RELEASE}.tgz" && \ "https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_RELEASE}.tgz" && \
curl -fo \ curl -fo \
/root-layer/docker-tgz/docker_armv7l.tgz -L \ /root-layer/docker-tgz/docker_armv7l.tgz -L \
"https://download.docker.com/linux/static/stable/armhf/docker-${DOCKER_RELEASE}.tgz" && \ "https://download.docker.com/linux/static/stable/armhf/docker-${DOCKER_RELEASE}.tgz" && \
curl -fo \ curl -fo \
/root-layer/docker-tgz/docker_aarch64.tgz -L \ /root-layer/docker-tgz/docker_aarch64.tgz -L \
"https://download.docker.com/linux/static/stable/aarch64/docker-${DOCKER_RELEASE}.tgz" "https://download.docker.com/linux/static/stable/aarch64/docker-${DOCKER_RELEASE}.tgz"
# copy local files # copy local files
COPY --from=compose-amd64 /usr/local/bin/docker-compose /root-layer/docker-compose-ubuntu/docker-compose_x86_64 COPY --from=compose-amd64 /usr/local/bin/docker-compose /root-layer/docker-compose-ubuntu/docker-compose_x86_64
root/etc/cont-init.d/95-apt-get
+5
View File
@@ -0,0 +1,5 @@
#!/usr/bin/with-contenv bash
if [ -f /usr/bin/apt ]; then
apt-get update
fi
root/etc/cont-init.d/98-docker-in-docker
+34 -35
View File
@@ -6,45 +6,44 @@ chown -R ${ABC_USER}:${ABC_USER} /config/logs
echo "**** installing docker and docker compose ****" echo "**** installing docker and docker compose ****"
if [ -f /usr/bin/apt ]; then if [ -f /usr/bin/apt ]; then
DISTRONAME="ubuntu" DISTRONAME="ubuntu"
apt-get update && \ apt-get install -y \
apt-get install -y \ btrfs-progs \
btrfs-progs \ ca-certificates \
ca-certificates \ curl \
curl \ e2fsprogs \
e2fsprogs \ iptables \
iptables \ openssh-client \
openssh-client \ openssl \
openssl \ pigz \
pigz \ xfsprogs \
xfsprogs \ xz-utils
xz-utils
else else
DISTRONAME="alpine" DISTRONAME="alpine"
apk add --no-cache \ apk add --no-cache \
btrfs-progs \ btrfs-progs \
curl \ curl \
e2fsprogs \ e2fsprogs \
e2fsprogs-extra \ e2fsprogs-extra \
ip6tables \ ip6tables \
iptables \ iptables \
openssl \ openssl \
pigz \ pigz \
xfsprogs \ xfsprogs \
xz xz
fi fi
ARCH=$(uname -m) ARCH=$(uname -m)
if [ -f "/docker-compose-${DISTRONAME}/docker-compose_${ARCH}" ] ; then if [ -f "/docker-compose-${DISTRONAME}/docker-compose_${ARCH}" ] ; then
echo "Copying over docker and docker-compose binaries" echo "Copying over docker and docker-compose binaries"
mv "/docker-compose-${DISTRONAME}/docker-compose_${ARCH}" /usr/local/bin/docker-compose mv "/docker-compose-${DISTRONAME}/docker-compose_${ARCH}" /usr/local/bin/docker-compose
chmod +x /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose
rm -rf /docker-compose-ubuntu /docker-compose-alpine rm -rf /docker-compose-ubuntu /docker-compose-alpine
tar xf /docker-tgz/docker_${ARCH}.tgz \ tar xf /docker-tgz/docker_${ARCH}.tgz \
--strip-components=1 -C \ --strip-components=1 -C \
/usr/local/bin/ /usr/local/bin/
rm -rf /docker-tgz rm -rf /docker-tgz
else else
echo "**** docker and docker-compose already installed, skipping ****" echo "**** docker and docker-compose already installed, skipping ****"
fi fi
# delete PID if exists # delete PID if exists
@@ -53,5 +52,5 @@ find /run /var/run -iname 'docker*.pid' -delete || :
# create docker group and add abc to it # create docker group and add abc to it
groupadd -f docker groupadd -f docker
if ! id -nG ${ABC_USER} | grep -q "docker"; then if ! id -nG ${ABC_USER} | grep -q "docker"; then
usermod -aG docker ${ABC_USER} usermod -aG docker ${ABC_USER}
fi fi