Update docker registry and deploy process

anyone-protocol · Jul 31, 2024 · 4d3fa9c · 4d3fa9c
1 parent 2ed478e
commit 4d3fa9c
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 218 deletions.
diff --git a/.github/actions/build-and-push/action.yml b/.github/actions/build-and-push/action.yml
@@ -29,6 +29,7 @@ runs:
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v3
       with:
+        registry: ghcr.io
         username: ${{ inputs.docker-username }}
         password: ${{ inputs.docker-password }}
 

diff --git a/.github/actions/multiarch-push/action.yml b/.github/actions/multiarch-push/action.yml
@@ -20,6 +20,7 @@ runs:
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v3
       with:
+        registry: ghcr.io
         username: ${{ inputs.docker-username }}
         password: ${{ inputs.docker-password }}
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,9 +25,9 @@ jobs:
       - name: Build and push
         uses: ./.github/actions/build-and-push
         with:
-          docker-username: ${{ secrets.DOCKER_USERNAME }}
-          docker-password: ${{ secrets.DOCKER_PASSWORD }}
-          docker-base-repo: ${{ secrets.DOCKER_BASE_REPO_DEV }}-${{ matrix.platform.image-suffix }}
+          docker-username: ${{ secrets.CR_USERNAME }}
+          docker-password: ${{ secrets.CR_PAT }}
+          docker-base-repo: ghcr.io/ator-development/ator-protocol-dev-${{ matrix.platform.image-suffix }}
           docker-tag: latest-pr
           docker-platform: ${{ matrix.platform.name }}
           version: ${{ github.sha }}

diff --git a/.github/workflows/dev-build-and-push.yml b/.github/workflows/dev-build-and-push.yml
@@ -27,9 +27,9 @@ jobs:
       - name: Build and push
         uses: ./.github/actions/build-and-push
         with:
-          docker-username: ${{ secrets.DOCKER_USERNAME }}
-          docker-password: ${{ secrets.DOCKER_PASSWORD }}
-          docker-base-repo: ${{ secrets.DOCKER_BASE_REPO_DEV }}-${{ matrix.platform.image-suffix }}
+          docker-username: ${{ secrets.CR_USERNAME }}
+          docker-password: ${{ secrets.CR_PAT }}
+          docker-base-repo: ghcr.io/ator-development/ator-protocol-dev-${{ matrix.platform.image-suffix }}
           docker-tag: ${{ env.image-tag }}
           docker-platform: ${{ matrix.platform.name }}
           version: ${{ github.sha }}
@@ -45,9 +45,9 @@ jobs:
       - name: Multiarch push
         uses: ./.github/actions/multiarch-push
         with:
-          docker-username: ${{ secrets.DOCKER_USERNAME }}
-          docker-password: ${{ secrets.DOCKER_PASSWORD }}
-          docker-base-repo: ${{ secrets.DOCKER_BASE_REPO_DEV }}
+          docker-username: ${{ secrets.CR_USERNAME }}
+          docker-password: ${{ secrets.CR_PAT }}
+          docker-base-repo: ghcr.io/ator-development/ator-protocol-dev
           docker-tag: ${{ env.image-tag }}
           event-name: ${{ github.event_name }}
   deploy:

diff --git a/.github/workflows/dev-deploy.yml b/.github/workflows/dev-deploy.yml
@@ -5,7 +5,7 @@ on:
   workflow_call:
 
 env:
-  image-name: ${{ secrets.DOCKER_BASE_REPO_DEV }}
+  image-name: ghcr.io/ator-development/ator-protocol-dev
   image-tag: ${{ github.event_name == 'workflow_call' && 'latest' || github.sha }}
   da-1-hc-url: http://49.13.145.234:9030/tor/status-vote/current/consensus
   da-2-hc-url: http://5.161.108.187:9030/tor/status-vote/current/consensus

diff --git a/.github/workflows/live-build-and-push.yml b/.github/workflows/live-build-and-push.yml
@@ -27,9 +27,9 @@ jobs:
       - name: Build and push
         uses: ./.github/actions/build-and-push
         with:
-          docker-username: ${{ secrets.DOCKER_USERNAME }}
-          docker-password: ${{ secrets.DOCKER_PASSWORD }}
-          docker-base-repo: ${{ secrets.DOCKER_BASE_REPO_LIVE }}-${{ matrix.platform.image-suffix }}
+          docker-username: ${{ secrets.CR_USERNAME }}
+          docker-password: ${{ secrets.CR_PAT }}
+          docker-base-repo: ghcr.io/ator-development/ator-protocol-${{ matrix.platform.image-suffix }}
           docker-tag: ${{ env.image-tag }}
           docker-platform: ${{ matrix.platform.name }}
           version: ${{ github.sha }}
@@ -45,9 +45,9 @@ jobs:
       - name: Multiarch push
         uses: ./.github/actions/multiarch-push
         with:
-          docker-username: ${{ secrets.DOCKER_USERNAME }}
-          docker-password: ${{ secrets.DOCKER_PASSWORD }}
-          docker-base-repo: ${{ secrets.DOCKER_BASE_REPO_LIVE }}
+          docker-username: ${{ secrets.CR_USERNAME }}
+          docker-password: ${{ secrets.CR_PAT }}
+          docker-base-repo: ghcr.io/ator-development/ator-protocol
           docker-tag: ${{ env.image-tag }}
           event-name: ${{ github.event_name }}
 

diff --git a/.github/workflows/live-deploy.yml b/.github/workflows/live-deploy.yml
@@ -5,7 +5,7 @@ on:
   workflow_call:
 
 env:
-  image-name: ${{ secrets.DOCKER_BASE_REPO_LIVE }}
+  image-name: ghcr.io/ator-development/ator-protocol
   image-tag: ${{ github.event_name == 'workflow_call' && github.ref_name || 'latest' }}
   da-1-hc-url: http://49.13.145.234:9230/tor/status-vote/current/consensus
   da-2-hc-url: http://5.161.108.187:9230/tor/status-vote/current/consensus

diff --git a/.github/workflows/stage-build-and-push.yml b/.github/workflows/stage-build-and-push.yml
@@ -27,9 +27,9 @@ jobs:
       - name: Build and push
         uses: ./.github/actions/build-and-push
         with:
-          docker-username: ${{ secrets.DOCKER_USERNAME }}
-          docker-password: ${{ secrets.DOCKER_PASSWORD }}
-          docker-base-repo: ${{ secrets.DOCKER_BASE_REPO_STAGE }}-${{ matrix.platform.image-suffix }}
+          docker-username: ${{ secrets.CR_USERNAME }}
+          docker-password: ${{ secrets.CR_PAT }}
+          docker-base-repo: ghcr.io/ator-development/ator-protocol-stage-${{ matrix.platform.image-suffix }}
           docker-tag: ${{ env.image-tag }}
           docker-platform: ${{ matrix.platform.name }}
           version: ${{ github.sha }}
@@ -45,9 +45,9 @@ jobs:
       - name: Multiarch push
         uses: ./.github/actions/multiarch-push
         with:
-          docker-username: ${{ secrets.DOCKER_USERNAME }}
-          docker-password: ${{ secrets.DOCKER_PASSWORD }}
-          docker-base-repo: ${{ secrets.DOCKER_BASE_REPO_STAGE }}
+          docker-username: ${{ secrets.CR_USERNAME }}
+          docker-password: ${{ secrets.CR_PAT }}
+          docker-base-repo: ghcr.io/ator-development/ator-protocol-stage
           docker-tag: ${{ env.image-tag }}
           event-name: ${{ github.event_name }}
   deploy:

diff --git a/.github/workflows/stage-deploy.yml b/.github/workflows/stage-deploy.yml
@@ -5,7 +5,7 @@ on:
   workflow_call:
 
 env:
-  image-name: ${{ secrets.DOCKER_BASE_REPO_STAGE }}
+  image-name: ghcr.io/ator-development/ator-protocol-stage
   image-tag: ${{ github.event_name == 'workflow_call' && 'latest' || github.sha }}
   da-1-hc-url: http://49.13.145.234:9130/tor/status-vote/current/consensus
   da-2-hc-url: http://5.161.108.187:9130/tor/status-vote/current/consensus

diff --git a/operations/anon-da-node-dev.hcl b/operations/anon-da-node-dev.hcl
@@ -57,7 +57,7 @@ job "ator-dir-auth-dev" {
       }
 
       config {
-        image = "svforte/anon-dev:PLACEIMAGETAGHERE"
+        image = "ghcr.io/ator-development/ator-protocol-dev:PLACEIMAGETAGHERE"
         ports = ["orport", "dirport"]
         volumes = [
           "local/anonrc:/etc/anon/anonrc",
@@ -129,6 +129,8 @@ job "ator-dir-auth-dev" {
 User anond
 DataDirectory /var/lib/anon
 
+AgreeToTerms 1
+
 AuthoritativeDirectory 1
 V3AuthoritativeDirectory 1
 

diff --git a/operations/anon-da-node-live.hcl b/operations/anon-da-node-live.hcl
@@ -72,7 +72,7 @@ job "ator-dir-auth-live" {
       }
 
       config {
-        image = "svforte/anon:PLACEIMAGETAGHERE"
+        image = "ghcr.io/ator-development/ator-protocol-live:PLACEIMAGETAGHERE"
         ports = ["orport", "dirport"]
         volumes = [
           "local/anonrc:/etc/anon/anonrc",
@@ -146,6 +146,8 @@ job "ator-dir-auth-live" {
 User anond
 DataDirectory /var/lib/anon
 
+AgreeToTerms 1
+
 AuthoritativeDirectory 1
 V3AuthoritativeDirectory 1
 

diff --git a/operations/anon-da-node-stage.hcl b/operations/anon-da-node-stage.hcl
@@ -60,7 +60,7 @@ job "ator-dir-auth-stage" {
       }
 
       config {
-        image = "svforte/anon-stage:PLACEIMAGETAGHERE"
+        image = "ghcr.io/ator-development/ator-protocol-stage:PLACEIMAGETAGHERE"
         ports = ["orport", "dirport"]
         volumes = [
           "local/anonrc:/etc/anon/anonrc",
@@ -134,6 +134,8 @@ job "ator-dir-auth-stage" {
 User anond
 DataDirectory /var/lib/anon
 
+AgreeToTerms 1
+
 AuthoritativeDirectory 1
 V3AuthoritativeDirectory 1
 

diff --git a/operations/anon-debian-repo.hcl b/operations/anon-debian-repo.hcl
@@ -120,7 +120,7 @@ server {
       driver = "docker"
 
       config {
-        image = "svforte/package-exporter:v0.0.3"
+        image = "ghcr.io/ator-development/package-exporter:v0.0.4"
         ports = ["exporter-http"]
         volumes = [
           "local/exporter.yml:/app/config.yml:ro",

diff --git a/operations/ator-da-node-dev.hcl b/operations/ator-da-node-dev.hcl