move some deployment files, fix some cert install steps

.rhel-registry/docker-compose.yml → .fda-builder/docker-compose.yml

@@ -8,7 +8,7 @@ services:
     hostname: fda-registry-service
     image: registry:2
     volumes:
-      - ./certs:/certs
+      - /tmp/certs:/certs
     ports:
       - "443:443"
       - "5000:5000"

.rhel-registry/install_cert → .fda-builder/registry/install_cert

 #!/bin/bash
 CA_PATH="/etc/letsencrypt/live/docker.ossdip.at"
-CERT_PATH="./.rhel-registry/certs"
-USER="rocky"
+CERT_PATH="/tmp/certs"
+USER="gitlab-runner"
 
 if [ "$ENV" != "prod" ]; then
   echo "WARN: environment must be prod"
   exit 0
 fi
 
+# create directory
+sudo mkdir -p "$CERT_PATH"
+
+# request new certificate if necessary
 sudo certbot certonly --standalone --preferred-challenges http -d docker.ossdip.at \
                 -m martin.weise@tuwien.ac.at --agree-tos --keep-until-expiring
 
-sudo cp "${CA_PATH}/privkey.pem" "${CERT_PATH}"
-sudo cp "${CA_PATH}/fullchain.pem" "${CERT_PATH}"
-
-mkdir -p "${CERT_PATH}"
+# make acessible to docker
 sudo chown -R "${USER}:docker" "${CERT_PATH}"
-
-ls -la "${CERT_PATH}"

Makefile

@@ -116,7 +116,7 @@ run-sandbox: config-frontend
 deploy-registry: config-registry
 	docker-compose -f ./.rhel-registry/docker-compose.yml up -d
 
-registry-stable-tag: config build test
+registry-stable-tag: config-registry build test
 	docker tag fda-metadata-db:latest ${REGISTRY}/fda-metadata-db
 	docker tag fda-authentication-service:latest ${REGISTRY}/fda-authentication-service
 	docker tag fda-broker-service:latest ${REGISTRY}/fda-broker-service
@@ -141,7 +141,7 @@ registry-stable-push: registry-stable-tag registry-stable-tag
 
 registry-stable: registry-stable-tag registry-stable-push
 
-registry-staging-tag: config build test
+registry-staging-tag: config-registry build test
 	docker tag fda-metadata-db:staging ${REGISTRY}/fda-metadata-db
 	docker tag fda-authentication-service:staging ${REGISTRY}/fda-authentication-service
 	docker tag fda-broker-service:staging ${REGISTRY}/fda-broker-service