Merge pull request #9 from leibniz-psychology/development

Fix Main Deployment

Author: joelbeckmann

.github/workflows/DeployOpencpuStg.yaml

@@ -0,0 +1,91 @@
+name: Deploy to AKS (dev)
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ staging ]
+
+jobs:
+  build:
+    name: Deploy to AKS
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    env:
+      GH_BRANCH: ${{ github.ref_name }}
+      GH_SHA: ${{ github.sha }}
+      NAMESPACE: staging
+      APP: fearbase/ocpu
+      REGISTRY: ${{ secrets.ACR_NAME }}.azurecr.io
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+        with:
+          ref: 'staging'
+
+#      - name: Construct image ref
+#        run: echo "IMAGE_REF=${REGISTRY}/${GITHUB_REPOSITORY,,}/${APP}:$(cat ${APP}/VERSION)" >> $GITHUB_ENV
+
+      - name: Azure Login
+        uses: azure/login@v1
+        with:
+          creds: "${{ secrets.AZURE_CREDENTIALS }}"
+
+      - name: Connect to Azure Container Registry (ACR)
+        run: |
+          az acr login --name ${{ secrets.ACR_NAME }}
+
+      - name: Create php image build based on staging and push to a Azure Container Registry (ACR)
+        if: github.ref_name == 'staging' &&  success()
+        run: |
+          DOCKER_BUILDKIT=1 docker build . -t ${{ secrets.ACR_NAME }}.azurecr.io/${{ env.APP }}:${{ github.sha }} \
+            --build-arg OCPU_PASS=${{ secrets.OCPU_PASS}} \
+            --build-arg SSL_KEY=${{ secrets.SSL_KEY}} \
+            --file .github/workflows/manifests/staging/opencpu/Dockerfile
+          docker push ${{ secrets.ACR_NAME }}.azurecr.io/${{ env.APP }}:${{ github.sha }}
+
+      - name: set tag latest-stg
+        run: |
+          docker pull ${{ secrets.ACR_NAME }}.azurecr.io/${{ env.APP }}:${{ github.sha }}
+          docker tag ${{ secrets.ACR_NAME }}.azurecr.io/${{ env.APP }}:${{ github.sha }} ${{ secrets.ACR_NAME }}.azurecr.io/${{ env.APP }}:latest-stg
+          docker push ${{ secrets.ACR_NAME }}.azurecr.io/${{ env.APP }}:latest-stg
+  kustomize:
+    name: kustomize
+    runs-on: ubuntu-latest
+    needs: build
+    permissions:
+      contents: read
+    env:
+      APP: fearbase/ocpu
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+        with:
+          repository: leibniz-psychology/FEARBASE-R-gitops
+          ref: main
+          ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
+          persist-credentials: true
+          # path: config
+
+      - name: Setup Kustomize
+        uses: imranismail/setup-kustomize@v1
+        with:
+          kustomize-version: "3.6.1"
+
+      - name: Switch out image tag
+        run: |
+          cd stg
+          kustomize edit set image crzpiddev.azurecr.io/${{ env.APP }}:${{ github.sha }}
+          cat kustomization.yaml
+
+      - name: Commit files
+        run: |
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+          git commit -am "Update docker tag "${{ github.sha }}""
+      - name: Git push
+        uses: ad-m/github-push-action@master
+        with:
+          repository: leibniz-psychology/FEARBASE-R-gitops
+          ssh: true
+          branch: main

.github/workflows/manifests/main/opencpu/Dockerfile

@@ -10,7 +10,7 @@ RUN cd /home/opencpu && \
     apt-get update && \
     apt-get install -y openssl && \
     openssl req -x509 -newkey rsa:4096 -sha256 -days 3650 -nodes \
-      -keyout fearbase-ocpu_ssl.key -out fearbase-ocpu_ssl.crt -subj "/CN=fearbase-ocpu.dev.zpid.org" \
+      -keyout fearbase-ocpu_ssl.key -out fearbase-ocpu_ssl.crt -subj "/CN=fearbase-ocpu.zpid.org" \
       -addext "subjectAltName=DNS:fearbase-ocpu.zpid.org,DNS:www.fearbase-ocpu.zpid.org,IP:127.0.0.1"
 
 RUN cd /home/opencpu && \
@@ -19,14 +19,12 @@ RUN cd /home/opencpu && \
 
 #copy some config files
 COPY . /home/opencpu/fearbase
-COPY .github/workflows/manifests/main/opencpu/index.html  /var/www/html/index.html
 
 RUN cd /home/opencpu && \
     R -e "install.packages('remotes')" && \
     R CMD build fearbase && \
     mv fearbase_*.tar.gz fearbase_latest.tar.gz && \
-    R CMD INSTALL fearbase_latest.tar.gz --library=/usr/local/lib/R/site-library && \
-    chmod 755 /var/www/html/index.html
+    R CMD INSTALL fearbase_latest.tar.gz --library=/usr/local/lib/R/site-library
 
 # Set opencpu password
 RUN \

.github/workflows/manifests/staging/opencpu/Dockerfile

@@ -0,0 +1,37 @@
+FROM crzpiddev.azurecr.io/fearbase/ocpu-base-image:latest-dev
+
+ARG OCPU_PASS
+ARG SSL_KEY
+
+RUN apt update -y &&\
+    apt install -y vim
+
+RUN cd /home/opencpu && \
+    apt-get update && \
+    apt-get install -y openssl && \
+    openssl req -x509 -newkey rsa:4096 -sha256 -days 3650 -nodes \
+      -keyout fearbase-ocpu_ssl.key -out fearbase-ocpu_ssl.crt -subj "/CN=fearbase-ocpu.stg.zpid.org" \
+      -addext "subjectAltName=DNS:fearbase-ocpu.stg.zpid.org,DNS:www.fearbase-ocpu.stg.zpid.org,IP:127.0.0.1"
+
+RUN cd /home/opencpu && \
+    mv /home/opencpu/fearbase-ocpu_ssl.crt /etc/ssl/certs/ && \
+    mv /home/opencpu/fearbase-ocpu_ssl.key /etc/ssl/private/
+
+#copy some config files
+COPY . /home/opencpu/fearbase
+
+RUN cd /home/opencpu && \
+    R -e "install.packages('remotes')" && \
+    R CMD build fearbase && \
+    mv fearbase_*.tar.gz fearbase_latest.tar.gz && \
+    R CMD INSTALL fearbase_latest.tar.gz --library=/usr/local/lib/R/site-library
+
+# Set opencpu password
+RUN \
+  echo "opencpu:"$OCPU_PASS | chpasswd
+
+
+
+
+
+