Revert: Force HTTP
This commit is contained in:
@@ -46,31 +46,23 @@ jobs:
|
|||||||
go build -o build/hamview-collector ./cmd/hamview-collector && \
|
go build -o build/hamview-collector ./cmd/hamview-collector && \
|
||||||
ls -al $(readlink -f build/hamview-collector)
|
ls -al $(readlink -f build/hamview-collector)
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v2
|
uses: docker/setup-buildx-action@v3
|
||||||
with:
|
- name: Log in to Docker
|
||||||
config-inline: |
|
uses: docker/login-action@v3
|
||||||
[registry."10.42.23.15"]
|
|
||||||
http = true
|
|
||||||
insecure = true
|
|
||||||
[registry."10.42.23.15:3000"]
|
|
||||||
http = true
|
|
||||||
insecure = true
|
|
||||||
- name: Log into Docker Container Registry
|
|
||||||
uses: docker/login-action@v2
|
|
||||||
with:
|
with:
|
||||||
username: ${{ vars.DOCKER_USER }}
|
username: ${{ vars.DOCKER_USER }}
|
||||||
password: ${{ secrets.DOCKER_TOKEN }}
|
password: ${{ secrets.DOCKER_TOKEN }}
|
||||||
- name: Log into Gitea Container Registry
|
- name: Log in to Gitea
|
||||||
uses: docker/login-action@v2
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
registry: http://10.42.23.15:3000
|
registry: ${{ vars.REGISTRY }}
|
||||||
username: ${{ vars.DEPLOY_USER }}
|
username: ${{ vars.DEPLOY_USER }}
|
||||||
password: ${{ secrets.DEPLOY_TOKEN }}
|
password: ${{ secrets.DEPLOY_TOKEN }}
|
||||||
- name: Build and push collector container
|
- name: Build and push collector container
|
||||||
uses: docker/build-push-action@v4
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
push: true
|
push: true
|
||||||
tags: 10.42.23.15:3000/ham/hamview/collector:dev
|
tags: ${{ vars.REGISTRY }}/ham/hamview/collector:dev
|
||||||
file: ./cmd/hamview-collector/Dockerfile
|
file: ./cmd/hamview-collector/Dockerfile
|
||||||
context: .
|
context: .
|
||||||
platforms: |
|
platforms: |
|
||||||
@@ -118,31 +110,23 @@ jobs:
|
|||||||
go build -o build/hamview-receiver-$GOARCH$GOARM ./cmd/hamview-receiver && \
|
go build -o build/hamview-receiver-$GOARCH$GOARM ./cmd/hamview-receiver && \
|
||||||
readlink -f build/hamview-receiver-$GOARCH$GOARM
|
readlink -f build/hamview-receiver-$GOARCH$GOARM
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v2
|
uses: docker/setup-buildx-action@v3
|
||||||
with:
|
- name: Log in to Docker
|
||||||
config-inline: |
|
uses: docker/login-action@v3
|
||||||
[registry."10.42.23.15"]
|
|
||||||
http = true
|
|
||||||
insecure = true
|
|
||||||
[registry."10.42.23.15:3000"]
|
|
||||||
http = true
|
|
||||||
insecure = true
|
|
||||||
- name: Log into Docker Container Registry
|
|
||||||
uses: docker/login-action@v2
|
|
||||||
with:
|
with:
|
||||||
username: ${{ vars.DOCKER_USER }}
|
username: ${{ vars.DOCKER_USER }}
|
||||||
password: ${{ secrets.DOCKER_TOKEN }}
|
password: ${{ secrets.DOCKER_TOKEN }}
|
||||||
- name: Log into Gitea Container Registry
|
- name: Log in to Gitea
|
||||||
uses: docker/login-action@v2
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
registry: http://10.42.23.15:3000
|
registry: ${{ vars.REGISTRY }}
|
||||||
username: ${{ vars.DEPLOY_USER }}
|
username: ${{ vars.DEPLOY_USER }}
|
||||||
password: ${{ secrets.DEPLOY_TOKEN }}
|
password: ${{ secrets.DEPLOY_TOKEN }}
|
||||||
- name: Build and push receiver container
|
- name: Build and push collector container
|
||||||
uses: docker/build-push-action@v4
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
push: true
|
push: true
|
||||||
tags: 10.42.23.15:3000/ham/hamview/receiver:dev
|
tags: ${{ vars.REGISTRY }}/ham/hamview/receiver:dev
|
||||||
file: ./cmd/hamview-receiver/Dockerfile
|
file: ./cmd/hamview-receiver/Dockerfile
|
||||||
context: .
|
context: .
|
||||||
platforms: |
|
platforms: |
|
||||||
|
|||||||
Reference in New Issue
Block a user