Merge pull request #36 from unfor19/fix-master

Fix master
unfor19 · Mar 22, 2021 · 998db0a · 998db0a
2 parents a2fc99b + 6274764
commit 998db0a
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 76 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -1,56 +1,73 @@
 name: testing
 on: push
+
+env:
+  TARGET_BASE: build
+  TARGET_APP: app
+  DOCKER_BUILDKIT: 1
+
 jobs:
-  docker_build:
-    runs-on: ubuntu-latest
+  docker-build:
     name: docker build
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        include:
+          - GHCR_CACHED_TAG_PREFIX: "ghcr.io/unfor19/frigga:latest"
+            DOCKERFILE_PATH: Dockerfile
     steps:
       - uses: actions/checkout@v2
-      - name: Inject slug/short variables
-        uses: rlespinasse/github-slug-action@v3.x
-      - name: Set env vars
+      - name: docker login ghcr
         run: |
-          export BRANCH_NAME=${{ env.GITHUB_REF_SLUG }}
-          [[ $BRANCH_NAME = "master" ]] && export BRANCH_NAME=master-test
-          echo DOCKER_TAG=docker.pkg.github.com/${GITHUB_REPOSITORY}/${BRANCH_NAME//\//-}:test >> $GITHUB_ENV
-      - name: docker login
+          echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
+      - name: docker pull cached
         run: |
-          echo ${{ secrets.GITHUB_TOKEN }} | docker login docker.pkg.github.com -u $GITHUB_ACTOR --password-stdin
-      - name: docker pull
+          docker pull "${{ matrix.GHCR_CACHED_TAG_PREFIX }}-${TARGET_BASE}" || true
+          docker pull "${{ matrix.GHCR_CACHED_TAG_PREFIX }}-${TARGET_APP}" || true
+      - name: docker build cached
         run: |
-          docker pull "$DOCKER_TAG" || true
-      - name: docker build
-        run: docker build . -t cached --cache-from="$DOCKER_TAG" --build-arg GITHUB_SHA=$GITHUB_SHA
-      - name: docker tag
-        run: docker tag cached "$DOCKER_TAG"
-      - name: docker push
-        run: docker push "$DOCKER_TAG" || true
-
+          docker build . -t "cached-${TARGET_BASE}" \
+            --cache-from="${{ matrix.GHCR_CACHED_TAG_PREFIX }}-${TARGET_BASE}" \
+            -f "${{ matrix.DOCKERFILE_PATH }}" \
+            --target "${TARGET_BASE}" \
+            --build-arg BUILDKIT_INLINE_CACHE=1
+          docker build . -t "cached-${TARGET_APP}" \
+            --cache-from="${{ matrix.GHCR_CACHED_TAG_PREFIX }}-${TARGET_APP}" \
+            -f "${{ matrix.DOCKERFILE_PATH }}" \
+            --target "${TARGET_APP}" \
+            --build-arg BUILDKIT_INLINE_CACHE=1
+      - name: docker tag cached
+        run: |
+          docker tag "cached-${TARGET_BASE}" "${{ matrix.GHCR_CACHED_TAG_PREFIX }}-${TARGET_BASE}"
+          docker tag "cached-${TARGET_APP}"  "${{ matrix.GHCR_CACHED_TAG_PREFIX }}-${TARGET_APP}"
+      - name: docker push cached to ghcr
+        env:
+          GITHUB_TOKEN: "${{ secrets.GHTOKEN_PUSH_PKG }}"
+        run: |
+          docker push "${{ matrix.GHCR_CACHED_TAG_PREFIX }}-${TARGET_BASE}"
+          docker push "${{ matrix.GHCR_CACHED_TAG_PREFIX }}-${TARGET_APP}"
   ubuntu-cli:
-    needs: docker_build
+    needs: docker-build
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: [3.6, 3.7, 3.8, 3.9]
+        include:
+          - GHCR_CACHED_TAG_PREFIX: "ghcr.io/unfor19/frigga:latest"
+            DOCKERFILE_PATH: Dockerfile
+            DOCKERHUB_TAG: "unfor19/frigga:latest"
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Inject slug/short variables
-        uses: rlespinasse/github-slug-action@v3.x
-      - name: Set env vars
-        run: |
-          export BRANCH_NAME=${{ env.GITHUB_REF_SLUG }}
-          [[ $BRANCH_NAME = "master" ]] && export BRANCH_NAME=master-test
-          echo DOCKER_TAG=docker.pkg.github.com/${GITHUB_REPOSITORY}/${BRANCH_NAME//\//-}:test >> $GITHUB_ENV
-      - name: docker login
-        run: |
-          echo ${{ secrets.GITHUB_TOKEN }} | docker login docker.pkg.github.com -u $GITHUB_ACTOR --password-stdin
-      - name: docker pull
+      - name: docker pull cached from ghcr
         run: |
-          docker pull "$DOCKER_TAG"
+          echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
+          docker pull "${{ matrix.GHCR_CACHED_TAG_PREFIX }}-${TARGET_APP}"
+          docker tag "${{ matrix.GHCR_CACHED_TAG_PREFIX }}-${TARGET_APP}" "${{ matrix.DOCKERHUB_TAG }}"
+          echo "DOCKER_TAG=${{ matrix.DOCKERHUB_TAG }}" >> $GITHUB_ENV
       - name: Install CLI
         run: |
           sudo apt remove python3-pip
@@ -64,55 +81,51 @@ jobs:
         run: ./docker-compose/apply_changes.sh
 
   ubuntu-webserver:
-    needs: docker_build
+    needs: docker-build
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - GHCR_CACHED_TAG_PREFIX: "ghcr.io/unfor19/frigga:latest"
+            DOCKERFILE_PATH: Dockerfile
+            DOCKERHUB_TAG: "unfor19/frigga:latest"
     steps:
       - uses: actions/checkout@v2
-      - name: Inject slug/short variables
-        uses: rlespinasse/github-slug-action@v3.x
-      - name: Set env vars
-        run: |
-          export BRANCH_NAME=${{ env.GITHUB_REF_SLUG }}
-          [[ $BRANCH_NAME = "master" ]] && export BRANCH_NAME=master-test
-          echo DOCKER_TAG=docker.pkg.github.com/${GITHUB_REPOSITORY}/${BRANCH_NAME//\//-}:test >> $GITHUB_ENV
-      - name: docker login
+      - name: docker pull cached from ghcr
         run: |
-          echo ${{ secrets.GITHUB_TOKEN }} | docker login docker.pkg.github.com -u $GITHUB_ACTOR --password-stdin
-      - name: docker pull
-        run: |
-          docker pull "$DOCKER_TAG"
+          echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
+          docker pull "${{ matrix.GHCR_CACHED_TAG_PREFIX }}-${TARGET_APP}"
+          docker tag "${{ matrix.GHCR_CACHED_TAG_PREFIX }}-${TARGET_APP}" "${{ matrix.DOCKERHUB_TAG }}"
+          echo "DOCKER_TAG=${{ matrix.DOCKERHUB_TAG }}" >> $GITHUB_ENV
       - name: Deploy Stack
         env:
           FRIGGA_TESTING: true
         run: bash docker-compose/deploy_stack.sh
       - name: Apply Changes
         run: ./docker-compose/apply_changes_webserver.sh
-
   ubuntu-websocket:
-    needs: docker_build
+    needs: docker-build
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - GHCR_CACHED_TAG_PREFIX: "ghcr.io/unfor19/frigga:latest"
+            DOCKERFILE_PATH: Dockerfile
+            DOCKERHUB_TAG: "unfor19/frigga:latest"
     steps:
       - uses: actions/checkout@v2
-      - name: Inject slug/short variables
-        uses: rlespinasse/github-slug-action@v3.x
-      - name: Set env vars
-        run: |
-          export BRANCH_NAME=${{ env.GITHUB_REF_SLUG }}
-          [[ $BRANCH_NAME = "master" ]] && export BRANCH_NAME=master-test
-          echo DOCKER_TAG=docker.pkg.github.com/${GITHUB_REPOSITORY}/${BRANCH_NAME//\//-}:test >> $GITHUB_ENV
-      - name: docker login
+      - name: docker pull cached from ghcr
         run: |
-          echo ${{ secrets.GITHUB_TOKEN }} | docker login docker.pkg.github.com -u $GITHUB_ACTOR --password-stdin
-      - name: docker pull
-        run: |
-          docker pull "$DOCKER_TAG"
+          echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
+          docker pull "${{ matrix.GHCR_CACHED_TAG_PREFIX }}-${TARGET_APP}"
+          docker tag "${{ matrix.GHCR_CACHED_TAG_PREFIX }}-${TARGET_APP}" "${{ matrix.DOCKERHUB_TAG }}"
+          echo "DOCKER_TAG=${{ matrix.DOCKERHUB_TAG }}" >> $GITHUB_ENV
       - name: Deploy Stack
         env:
           FRIGGA_TESTING: true
         run: bash docker-compose/deploy_stack.sh
       - name: Apply Changes
         run: ./docker-compose/apply_changes_websocket.sh
-
   minikube:
     runs-on: ubuntu-latest
     steps:

diff --git a/docker-compose/apply_changes_websocket.sh b/docker-compose/apply_changes_websocket.sh
@@ -19,7 +19,7 @@ docker run --rm -t "$_DOCKER_TAG" version
 docker run --rm -t --network host "$_DOCKER_TAG" \
     client-start --grafana-url http://grafana:3000 \
         --prom-url http://prometheus:9090 \
-        --frigga-url ws://localhost:8084 \
+        --frigga-url ws://localhost:8085 \
         --grafana-api-key "${GRAFANA_API_KEY}" \
         --prom-yaml-path "prometheus.yml" \
         --raw
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
@@ -20,18 +20,17 @@ services:
     volumes:
       - vmdata:/storage
     command:
-      - '--storageDataPath=/storage'
-      - '--graphiteListenAddr=:2003'
-      - '--opentsdbListenAddr=:4242'
-      - '--httpListenAddr=:8428'
-      - '--influxListenAddr=:8089'
+      - "--storageDataPath=/storage"
+      - "--graphiteListenAddr=:2003"
+      - "--opentsdbListenAddr=:4242"
+      - "--httpListenAddr=:8428"
+      - "--influxListenAddr=:8089"
     networks:
       - net1
     restart: always
-    depends_on: 
+    depends_on:
       - prometheus
 
-
   webserver:
     container_name: frigga_webserver
     image: "${DOCKER_TAG}"
@@ -50,7 +49,6 @@ services:
     networks:
       - net1
 
-
   webserver_socket:
     container_name: frigga_webserver_socket
     image: "${DOCKER_TAG}"
@@ -59,16 +57,15 @@ services:
     command:
       - "webserver-start"
       - "--port"
-      - "8084"
+      - "8085"
       - "--debug"
     ports:
-      - 8084:8084
+      - 8085:8085
     depends_on:
       - prometheus
     networks:
       - net1
 
-
   prometheus:
     container_name: frigga_prometheus
     image: prom/prometheus:v2.24.1
@@ -118,7 +115,7 @@ services:
       - net1
 
   grafana:
-    container_name: frigga_grafana    
+    container_name: frigga_grafana
     image: grafana/grafana:7.3.7
     volumes:
       - ./grafana/provisioning/:/etc/grafana/provisioning/

diff --git a/src/frigga/frigga.py b/src/frigga/frigga.py
@@ -161,7 +161,7 @@ def prometheus_get(prom_url, raw):
 )
 @click.option(
     '--port', '-p',
-    default=8084,
+    default=8085,
     prompt=False, required=False, type=int
 )
 @click.option(
@@ -213,7 +213,7 @@ def webserver_start(debug, port, use_http):
 )
 @click.option(
     '--frigga-url', '-gurl',
-    default='ws://localhost:8084',
+    default='ws://localhost:8085',
     required=False, type=str
 )
 @click.option(

diff --git a/src/frigga/wsserver.py b/src/frigga/wsserver.py
@@ -51,7 +51,7 @@ async def msg(websocket, path):
     print(f"Sent back: {message}")
 
 
-def run_wss(port=8084, debug=False):
+def run_wss(port=8085, debug=False):
     start_server = websockets.serve(msg, "0.0.0.0", port)
     asyncio.get_event_loop().run_until_complete(start_server)
     asyncio.get_event_loop().run_forever()