diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 308e3c8..6ab8318 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ variables: # E.g. BUILD_JOBS: build_debian_buster,build_ubuntu_bionic. This will include # arm builds, because build_debian_buster_arm matches build_debian_buster. # "BUILD_JOBS: none" won't build any build jobs, nor www. - BUILD_JOBS: build_alpine_319 + BUILD_JOBS: build_alpine_318 DOCKER_HOST: tcp://docker:2375 DOCKER_TLS_CERTDIR: "" diff --git a/builder/dockerfile.alpine_318.apk.build b/builder/dockerfile.alpine_318.apk.build index 209e142..f55ac41 100644 --- a/builder/dockerfile.alpine_318.apk.build +++ b/builder/dockerfile.alpine_318.apk.build @@ -8,12 +8,12 @@ WORKDIR $HOME/kasmvncserver ARG KASMVNC_ALPINE_PRIVATE_KEY ARG KASMVNC_ALPINE_PUBLIC_KEY -ENV APK_KEYS_DIR=/etc/apk/keys -RUN echo -n "$KASMVNC_ALPINE_PRIVATE_KEY" > \ - $APK_KEYS_DIR/kasmvnc_signing_key.rsa -RUN echo -n "$KASMVNC_ALPINE_PUBLIC_KEY" > \ - $APK_KEYS_DIR/kasmvnc_signing_key.rsa.pub + +ENV SCRIPTS_DIR=/tmp/scripts +COPY builder/scripts $SCRIPTS_DIR +RUN $SCRIPTS_DIR/install_alpine_signing_keys RUN useradd -m docker && echo "docker:docker" | chpasswd +RUN echo 'docker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers USER docker