code-server-docker: multi arch

.travis.yml

@@ -26,9 +26,10 @@ jobs:
       if: (NOT (type IN (pull_request)))
       script:
         # Set version
-        - COMPOSE_VERSION=$(curl -sX GET "https://api.github.com/repos/docker/compose/releases/latest" | awk '/tag_name/{print $4;exit}' FS='[""]')
+        - if [ -z ${COMPOSE_TAG+x} ]; then COMPOSE_TAG=$(curl -sX GET "https://api.github.com/repos/linuxserver/docker-docker-compose/releases/latest" | awk '/tag_name/{print $4;exit}' FS='[""]'); fi
+        - COMPOSE_VERSION=$(echo "$COMPOSE_TAG" | sed 's|-ls.*||g')
         # Build image
-        - docker build --no-cache --build-arg COMPOSE_VERSION=${COMPOSE_VERSION} -t ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${COMPOSE_VERSION}-${TRAVIS_COMMIT} .
+        - docker build --no-cache --build-arg COMPOSE_TAG=${COMPOSE_TAG} -t ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${COMPOSE_VERSION}-${TRAVIS_COMMIT} .
         - docker tag ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${COMPOSE_VERSION}-${TRAVIS_COMMIT} ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}
         # Login to DockerHub
         - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin

Dockerfile

@@ -1,20 +1,14 @@
+ARG COMPOSE_TAG="latest"
+
+FROM linuxserver/docker-compose:amd64-${COMPOSE_TAG} as compose-amd64
+FROM linuxserver/docker-compose:arm32v7-${COMPOSE_TAG} as compose-arm32
+FROM linuxserver/docker-compose:arm64v8-${COMPOSE_TAG} as compose-arm64
+
 FROM lsiobase/alpine:3.11 as buildstage
 
-ARG COMPOSE_VERSION
+COPY --from=compose-amd64 /usr/local/bin/docker-compose /root-layer/docker-compose/docker-compose_x86_64
-
+COPY --from=compose-arm32 /usr/local/bin/docker-compose /root-layer/docker-compose/docker-compose_armv7l
-RUN \
+COPY --from=compose-arm64 /usr/local/bin/docker-compose /root-layer/docker-compose/docker-compose_aarch64
- apk add --no-cache \
-    curl && \
- if [ -z ${COMPOSE_VERSION+x} ]; then \
-	COMPOSE_VERSION=$(curl -sX GET "https://api.github.com/repos/docker/compose/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- mkdir -p /root-layer && \
- curl -o \
-   /root-layer/docker-compose -L \
-   "https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-Linux-x86_64" && \
- chmod +x /root-layer/docker-compose
-
 COPY root/ /root-layer/
 
 # runtime stage

root/etc/cont-init.d/98-docker

@@ -7,7 +7,7 @@ fi
 [[ ! -f "/etc/apt/sources.list.d/docker-ce.list" ]] && \
   curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
   source /etc/os-release && \
-  echo "deb [arch=amd64] https://download.docker.com/linux/ubuntu $UBUNTU_CODENAME stable" > /etc/apt/sources.list.d/docker-ce.list
+  echo "deb https://download.docker.com/linux/ubuntu $UBUNTU_CODENAME stable" > /etc/apt/sources.list.d/docker-ce.list
 apt-get update && apt-get install -y --no-install-recommends \
   docker-ce
 echo "**** fixing permissions ****"
@@ -22,3 +22,12 @@ else
   fi
   usermod -aG "${DOCKER_NAME}" abc
 fi
+echo "**** installing docker compose ****"
+ARCH=$(uname -m)
+if [ -f "/docker-compose/docker-compose_${ARCH}" ]; then
+  mv "/docker-compose/docker-compose_${ARCH}" /usr/local/bin/docker-compose
+  chmod +x /usr/local/bin/docker-compose
+  rm -rf /docker-compose
+else
+  echo "docker-compose already installed, skipping"
+fi