diff --git a/.gitea/workflows/ssh-client-build-deploy.yaml b/.gitea/workflows/ssh-client-build-deploy.yaml index 4f21173..0656a4d 100644 --- a/.gitea/workflows/ssh-client-build-deploy.yaml +++ b/.gitea/workflows/ssh-client-build-deploy.yaml @@ -12,10 +12,9 @@ jobs: runs-on: ["oci-image-builder", "amd64"] steps: - - name: Checkout code uses: actions/checkout@v2 - + - name: Fetch limbo public actions env: RUNNER_TEMP: "${{ runner.temp }}" @@ -26,15 +25,12 @@ jobs: - name: Build and push ssh-client container images uses: ./.gitea/limbo_actions/buildkit-build-push with: - tags: git.limbosolutions.com/kb/ssh-client - registry_addr: ${{ vars.GITLIMBO_DOCKER_REGISTRY_ADDRESS }} - registry_username: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_USERNAME }} - registry_password: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_PASSWORD }} + tags: oci.limbosolutions.com/public/ssh-client:latest + registry_addr: ${{ vars.OCI_LIMBO_REGISTRY_ADDRESS }} + registry_username: ${{ secrets.OCI_LIMBO_REGISTRY_USERNAME }} + registry_password: ${{ secrets.OCI_LIMBO_REGISTRY_PASSWORD }} buildkit_addr: ${{ vars.BUILDKIT_ADDRESS }} dockerfile: ${{gitea.workspace}}/docker/ssh-client context: ${{gitea.workspace}}/docker/ssh-client - - - diff --git a/.gitea/workflows/ssh-server-build-deploy.yaml b/.gitea/workflows/ssh-server-build-deploy.yaml index 7125052..eb8e706 100644 --- a/.gitea/workflows/ssh-server-build-deploy.yaml +++ b/.gitea/workflows/ssh-server-build-deploy.yaml @@ -25,10 +25,10 @@ jobs: - name: Build and push ssh-image container image uses: ./.gitea/limbo_actions/buildkit-build-push with: - tags: git.limbosolutions.com/kb/ssh-server - registry_addr: ${{ vars.GITLIMBO_DOCKER_REGISTRY_ADDRESS }} - registry_username: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_USERNAME }} - registry_password: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_PASSWORD }} + tags: oci.limbosolutions.com/public/ssh-server + registry_addr: ${{ vars.OCI_LIMBO_REGISTRY_ADDRESS }} + registry_username: ${{ secrets.OCI_LIMBO_REGISTRY_USERNAME }} + registry_password: ${{ secrets.OCI_LIMBO_REGISTRY_PASSWORD }} buildkit_addr: ${{ vars.BUILDKIT_ADDRESS }} dockerfile: ${{gitea.workspace}}/docker/ssh-server context: ${{gitea.workspace}}/docker/ssh-server diff --git a/README.md b/README.md index 2522a20..76fef8e 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ ssh -f -N -L localhost:8001:target-server:80 usr@jump-machine.local ``` bash podman container run \ -v $HOME/.ssh:/root/.ssh:ro,Z \ - git.limbosolutions.com/kb/ssh-client:latest + oci.limbosolutions.com/public/ssh-client:latest ``` ### kubernetes @@ -71,7 +71,7 @@ metadata: spec: containers: - name: ssh-client - image: git.limbosolutions.com/kb/ssh-client:latest + image: oci.limbosolutions.com/public/ssh-client:latest tty: true command: ["bash", "-c"] args: @@ -120,10 +120,10 @@ spec: ``` bash podman build docker/ssh-client \ --build-context ssh-client=docker/ssh-client \ - -t git.limbosolutions.com/kb/ssh-client:local-dev + -t oci.limbosolutions.com/public/ssh-client:local-dev podman container run -it \ -v $HOME/.ssh:/root/.ssh:ro,Z \ - git.limbosolutions.com/kb/ssh-client:local-dev \ + oci.limbosolutions.com/public/ssh-client:local-dev \ /bin/bash ``` diff --git a/docker/ssh-server/README.md b/docker/ssh-server/README.md index c1c92c1..e9dbc6b 100644 --- a/docker/ssh-server/README.md +++ b/docker/ssh-server/README.md @@ -18,7 +18,7 @@ server: ## Podman ``` bash -podman pull git.limbosolutions.com/kb/ssh-server:latest +podman pull oci.limbosolutions.com/public/ssh-server:latest podman container run \ -p 2222:22 \ @@ -26,14 +26,14 @@ podman container run \ -v ./local/config:/etc/app/config \ -v ./local/server-certs:/etc/ssh/certs \ -v ./local/home:/home \ - git.limbosolutions.com/kb/ssh-server:latest + oci.limbosolutions.com/public/ssh-server:latest ``` ## docker ``` bash -docker pull git.limbosolutions.com/kb/ssh-server:latest +docker pull oci.limbosolutions.com/public/ssh-server:latest docker container run \ -p 2222:22 \ @@ -41,7 +41,7 @@ docker container run \ -v ./local/config:/etc/app/config \ -v ./local/server-certs:/etc/ssh/certs \ -v ./local/home:/home \ - git.limbosolutions.com/kb/ssh-server:latest + oci.limbosolutions.com/public/ssh-server:latest ``` diff --git a/docker/ssh-server/build.env b/docker/ssh-server/build.env index c8ac9b6..68f3696 100644 --- a/docker/ssh-server/build.env +++ b/docker/ssh-server/build.env @@ -1,2 +1,2 @@ -BUILD_ENV_IMAGE_TAG="git.limbosolutions.com/kb/ssh-server:latest" +BUILD_ENV_IMAGE_TAG="oci.limbosolutions.com/public/ssh-server:latest" BUILD_CLI="docker" \ No newline at end of file