Fixes to build and build for multiple architectures

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 stages:
-- build
+  - build
 
 variables:
   CACHETAG: build-${VERSION}

.gitlab-docker-armv7l.yml

@@ -1,16 +1,16 @@
-armv7l:build:
+build:armv7l:
   variables:
-    VERSION: armv7l-buster
+    VERSION: armv7l
   stage: build
   image: docker:latest
   script:
-  - if [ -f init ]; then chmod 500 init; fi
+    - if [ -f init ]; then chmod 500 init; fi
-  - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
+    - ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || true
-  - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
+    - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
-  - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
+    - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
-  - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
+    - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
   tags:
-  - docker
+    - docker
-  - armv7l
+    - armv7l
   only:
-  - buster
+    - master

.gitlab-docker-x86_64.yml

@@ -1,16 +1,16 @@
-x86_64:build:
+build:x86_64:
   variables:
     VERSION: x86_64
   stage: build
   image: docker:latest
   script:
-  - if [ -f init ]; then chmod 500 init; fi
+    - if [ -f init ]; then chmod 500 init; fi
-  - ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || echo "true"
+    - ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || true
-  - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
+    - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
-  - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
+    - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
-  - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
+    - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
   tags:
-  - docker
+    - docker
-  - x86_64
+    - x86_64
   only:
-  - master
+    - master

Dockerfile

@@ -26,7 +26,6 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-COPY doorparty-connector.ini /etc
 COPY sshd_config /etc/ssh
 COPY init /sbin/init