Merge branch '808-update-musl-dev-curl-curl-dev' into 'master'

Resolve "Update musl-dev, curl, curl-dev"

Closes #809 and #808

See merge request openappstack/openappstack!415

.gitlab-ci.yml

@@ -163,9 +163,6 @@ stages:
 variables:
   SSH_KEY_ID: "411"
   HOSTNAME: "${CI_COMMIT_REF_SLUG}"
-  # Repeated values, because we're not allowed to use a variable in a variable
-  SUBDOMAIN: "${CI_COMMIT_REF_SLUG}.ci"
-  DOMAIN: "openappstack.net"
   ANSIBLE_HOST_KEY_CHECKING: "False"
   KANIKO_BUILD_IMAGENAME: "openappstack-ci"
   CLUSTER_DIR: "/builds/openappstack/openappstack/clusters/${CI_COMMIT_REF_SLUG}"
@@ -259,6 +256,9 @@ report-ci-image-tag:
 
 create-vps:
   stage: create-vps
+  variables:
+    SUBDOMAIN: "${CI_COMMIT_REF_SLUG}.ci"
+    DOMAIN: "openappstack.net"
   script:
     - *debug_information
     # Creates a VPS based on a custom CI image for which --install-kubernetes
@@ -306,9 +306,9 @@ setup-openappstack:
     # Set up cluster
     # TODO: I set --no-install-openappstack to skip the old installation procedure, should be removed eventually
     - python3 -m openappstack $HOSTNAME install --install-kubernetes --no-install-openappstack
-    - scp -r ./install root@${SUBDOMAIN}.${DOMAIN}:/tmp/install
-    - ssh ${SUBDOMAIN}.${DOMAIN} -l root "/usr/bin/env /tmp/install/ci-write-variable-files.sh $IP_ADDRESS ${SUBDOMAIN}.${DOMAIN}"
-    - ssh ${SUBDOMAIN}.${DOMAIN} -l root "/usr/bin/env /tmp/install/install-openappstack.sh"
+    - scp -r ./install root@${FQDN}:/tmp/install
+    - ssh ${FQDN} -l root "/usr/bin/env /tmp/install/ci-write-variable-files.sh $IP_ADDRESS ${FQDN}"
+    - ssh ${FQDN} -l root "/usr/bin/env /tmp/install/install-openappstack.sh"
     # TODO: Should also be removed or made up-to-date
     # Show versions of installed apps/binaries
     # - cd ansible
@@ -426,7 +426,7 @@ single-sign-on-helm-release:
   stage: install-apps
   script:
     - *debug_information
-    - ssh ${SUBDOMAIN}.${DOMAIN} -l root "/usr/bin/env /tmp/install/install-${APP}.sh"
+    - ssh ${FQDN} -l root "/usr/bin/env /tmp/install/install-${APP}.sh"
   extends:
     - .ssh_setup
   interruptible: true

Dockerfile

@@ -14,14 +14,14 @@ RUN \
     cargo=~1.47.0-r2 \
     chromium=~86.0.4240.111-r0 \
     chromium-chromedriver=~86.0.4240.111-r0 \
-    curl=~7.77.0-r0 \
+    curl=~7.77.0-r1 \
     # needed for installing pycurl python module
-    curl-dev=~7.77.0-r0 \
+    curl-dev=~7.77.0-r1 \
     gcc=~10.2.1_pre1-r3 \
     git=~2.30.2-r0 \
     libffi-dev=3.3-r2 \
     make=~4.3-r0 \
-    musl-dev=~1.2.2-r0 \
+    musl-dev=~1.2.2-r1 \
     openssh-client=~8.4_p1-r3 \
     py3-pip=~20.3.4-r0 \
     py3-wheel=~0.36.2-r0 \

install/install-openappstack.sh

@@ -7,7 +7,7 @@ flux install \
 
 flux create source git openappstack \
   --url=https://open.greenhost.net/openappstack/openappstack \
-  --branch=try-flux-2 \
+  --branch=master \
   --interval=1m
 
 flux create kustomization openappstack \