diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 95b4054..7bf79a0 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -4,64 +4,87 @@ on: branches: - master jobs: - build-ingress: + build-error-pages: runs-on: ubuntu-latest steps: - - name: Checkout current branch with lfs - uses: actions/checkout@master - with: - lfs: true - - - name: Setup auth tokens - run: | - # Docker Hub - docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }} - - - name: Build and push ingress - run: | - docker build . -t schmelczera/declared-ingress - docker push schmelczera/declared-ingress - working-directory: ingress + - name: Checkout current branch with lfs + uses: actions/checkout@master + with: + lfs: true + + - name: Setup auth tokens + run: | + # Docker Hub + docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }} + + - name: Build and push error pages + run: | + docker build . -t schmelczera/declared-error-pages + docker push schmelczera/declared-error-pages + working-directory: error-pages + + build-ingress: + runs-on: ubuntu-latest + needs: + - build-error-pages + steps: + - name: Checkout current branch with lfs + uses: actions/checkout@master + with: + lfs: true + + - name: Setup auth tokens + run: | + # Docker Hub + docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }} + + - name: Build and push ingress + run: | + docker build . -t schmelczera/declared-ingress + docker push schmelczera/declared-ingress + working-directory: ingress build-frontend: runs-on: ubuntu-latest + needs: + - build-error-pages steps: - - name: Checkout current branch with lfs - uses: actions/checkout@master - with: - lfs: true - - - name: Setup auth tokens - run: | - # Docker Hub - docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }} + - name: Checkout current branch with lfs + uses: actions/checkout@master + with: + lfs: true - - name: Build and push frontend - run: | - docker build . -t schmelczera/declared-frontend - docker push schmelczera/declared-frontend - working-directory: frontend + - name: Setup auth tokens + run: | + # Docker Hub + docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }} + + - name: Build and push frontend + run: | + docker build . -t schmelczera/declared-frontend + docker push schmelczera/declared-frontend + working-directory: frontend deploy: runs-on: ubuntu-latest needs: - - build-frontend - - build-ingress + - build-frontend + - build-ingress steps: - - name: Checkout current branch with lfs - uses: actions/checkout@master - with: - lfs: true + - name: Checkout current branch with lfs + uses: actions/checkout@master + with: + lfs: true - - name: Setup auth tokens - run: | - # SSH key - mkdir ~/.ssh - echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519 - chmod 400 ~/.ssh/id_ed25519 - ssh -o StrictHostKeyChecking=no root@decla.red uptime + - name: Setup auth tokens + run: | + # SSH key + mkdir ~/.ssh + echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519 + chmod 400 ~/.ssh/id_ed25519 + ssh -o StrictHostKeyChecking=no root@decla.red uptime - - name: Stack up - run: | + - name: Stack up + run: | DOCKER_HOST=ssh://root@decla.red docker stack up declared -c docker-compose.yml - working-directory: infrastructure + working-directory: infrastructure diff --git a/README.md b/README.md index 87883bb..77cf9a1 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,9 @@ A good-looking 2D adventure. ## Todo -- Frontend nginx sidable logging -- webpack glsl loader +- Frontend nginx disable logging - procedural piano - lightweight object storage -- 502 error page for ingress -- vs code glsl formatter - docker engine dashboard? - local dev env - prettier script