moved containers to oci.limbosolutions.com
This commit is contained in:
@@ -1,81 +0,0 @@
|
|||||||
name: BuildKit Build and push - dev
|
|
||||||
description: "Build and push images using remote Buildkit"
|
|
||||||
inputs:
|
|
||||||
registry_addr:
|
|
||||||
description: registry address
|
|
||||||
required: true
|
|
||||||
registry_username:
|
|
||||||
description: "registry username"
|
|
||||||
required: true
|
|
||||||
registry_password:
|
|
||||||
description: "registry password"
|
|
||||||
required: true
|
|
||||||
buildkit_addr:
|
|
||||||
description: "buildkit address"
|
|
||||||
required: true
|
|
||||||
tags:
|
|
||||||
description: "image tags / buildctl image name"
|
|
||||||
required: true
|
|
||||||
context:
|
|
||||||
description: "buildctl build context"
|
|
||||||
required: false
|
|
||||||
default: "."
|
|
||||||
dockerfile:
|
|
||||||
description: "buildctl build dockerfile/folder"
|
|
||||||
required: true
|
|
||||||
default: "."
|
|
||||||
filename:
|
|
||||||
description: "Docker file name (Default: Dockerfile)"
|
|
||||||
required: true
|
|
||||||
default: "Dockerfile"
|
|
||||||
build_args:
|
|
||||||
description: "Build arguments (multiline KEY=VALUE)"
|
|
||||||
required: false
|
|
||||||
default: ""
|
|
||||||
runs:
|
|
||||||
using: "composite"
|
|
||||||
steps:
|
|
||||||
- name: run buildctl build and push
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
DOCKER_CONFIG="${RUNNER_TEMP}/.buildctl_docker"
|
|
||||||
mkdir -p "$DOCKER_CONFIG"
|
|
||||||
|
|
||||||
# clean up
|
|
||||||
trap 'rm -rf "$DOCKER_CONFIG"' EXIT
|
|
||||||
|
|
||||||
|
|
||||||
USER='${{ inputs.registry_username }}'
|
|
||||||
PASS='${{ inputs.registry_password }}'
|
|
||||||
AUTH=$(printf '%s:%s' "$USER" "$PASS" | base64 -w0)
|
|
||||||
cat > "$DOCKER_CONFIG/config.json" <<EOF
|
|
||||||
{
|
|
||||||
"auths": {
|
|
||||||
"${{ inputs.registry_addr }}": {
|
|
||||||
"auth": "$AUTH"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Build build-arg flags
|
|
||||||
BUILD_ARG_FLAGS=""
|
|
||||||
while IFS= read -r line; do
|
|
||||||
[[ -z "$line" ]] && continue
|
|
||||||
BUILD_ARG_FLAGS="$BUILD_ARG_FLAGS --opt build-arg:${line}"
|
|
||||||
done <<< "${{ inputs.build_args }}"
|
|
||||||
|
|
||||||
echo "Using build args: $BUILD_ARG_FLAGS"
|
|
||||||
|
|
||||||
echo "build and push image to ${{ inputs.registry_addr }}"
|
|
||||||
|
|
||||||
DOCKER_CONFIG="$DOCKER_CONFIG" buildctl \
|
|
||||||
--addr ${{ inputs.buildkit_addr }} \
|
|
||||||
build \
|
|
||||||
--frontend=dockerfile.v0 \
|
|
||||||
--local context=${{ inputs.context }} \
|
|
||||||
--local dockerfile=${{ inputs.dockerfile }} \
|
|
||||||
--opt filename=${{ inputs.filename }} \
|
|
||||||
$BUILD_ARG_FLAGS \
|
|
||||||
--output type=image,name=${{ inputs.tags }},push=true
|
|
||||||
@@ -23,7 +23,7 @@ jobs:
|
|||||||
curl -fsSL https://git.limbosolutions.com/kb/gitea/raw/branch/main/cloud-scripts/setup-limbo-actions.sh | bash 2>&1
|
curl -fsSL https://git.limbosolutions.com/kb/gitea/raw/branch/main/cloud-scripts/setup-limbo-actions.sh | bash 2>&1
|
||||||
|
|
||||||
- name: Build and push ssh-client container images
|
- name: Build and push ssh-client container images
|
||||||
uses: ./.gitea/actions/buildkit-build-push-dev
|
uses: ./.gitea/limbo_actions/buildkit-build-push
|
||||||
with:
|
with:
|
||||||
tags: oci.limbosolutions.com/public/ssh-client:latest
|
tags: oci.limbosolutions.com/public/ssh-client:latest
|
||||||
registry_addr: ${{ vars.OCI_LIMBO_REGISTRY_ADDRESS }}
|
registry_addr: ${{ vars.OCI_LIMBO_REGISTRY_ADDRESS }}
|
||||||
|
|||||||
@@ -25,10 +25,10 @@ jobs:
|
|||||||
- name: Build and push ssh-image container image
|
- name: Build and push ssh-image container image
|
||||||
uses: ./.gitea/limbo_actions/buildkit-build-push
|
uses: ./.gitea/limbo_actions/buildkit-build-push
|
||||||
with:
|
with:
|
||||||
tags: git.limbosolutions.com/kb/ssh-server
|
tags: oci.limbosolutions.com/public/ssh-server
|
||||||
registry_addr: ${{ vars.GITLIMBO_DOCKER_REGISTRY_ADDRESS }}
|
registry_addr: ${{ vars.OCI_LIMBO_REGISTRY_ADDRESS }}
|
||||||
registry_username: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_USERNAME }}
|
registry_username: ${{ secrets.OCI_LIMBO_REGISTRY_USERNAME }}
|
||||||
registry_password: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_PASSWORD }}
|
registry_password: ${{ secrets.OCI_LIMBO_REGISTRY_PASSWORD }}
|
||||||
buildkit_addr: ${{ vars.BUILDKIT_ADDRESS }}
|
buildkit_addr: ${{ vars.BUILDKIT_ADDRESS }}
|
||||||
dockerfile: ${{gitea.workspace}}/docker/ssh-server
|
dockerfile: ${{gitea.workspace}}/docker/ssh-server
|
||||||
context: ${{gitea.workspace}}/docker/ssh-server
|
context: ${{gitea.workspace}}/docker/ssh-server
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ ssh -f -N -L localhost:8001:target-server:80 usr@jump-machine.local
|
|||||||
``` bash
|
``` bash
|
||||||
podman container run \
|
podman container run \
|
||||||
-v $HOME/.ssh:/root/.ssh:ro,Z \
|
-v $HOME/.ssh:/root/.ssh:ro,Z \
|
||||||
git.limbosolutions.com/kb/ssh-client:latest
|
oci.limbosolutions.com/public/ssh-client:latest
|
||||||
```
|
```
|
||||||
|
|
||||||
### kubernetes
|
### kubernetes
|
||||||
@@ -71,7 +71,7 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: ssh-client
|
- name: ssh-client
|
||||||
image: git.limbosolutions.com/kb/ssh-client:latest
|
image: oci.limbosolutions.com/public/ssh-client:latest
|
||||||
tty: true
|
tty: true
|
||||||
command: ["bash", "-c"]
|
command: ["bash", "-c"]
|
||||||
args:
|
args:
|
||||||
@@ -120,10 +120,10 @@ spec:
|
|||||||
``` bash
|
``` bash
|
||||||
podman build docker/ssh-client \
|
podman build docker/ssh-client \
|
||||||
--build-context ssh-client=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 \
|
podman container run -it \
|
||||||
-v $HOME/.ssh:/root/.ssh:ro,Z \
|
-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
|
/bin/bash
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ server:
|
|||||||
## Podman
|
## Podman
|
||||||
|
|
||||||
``` bash
|
``` bash
|
||||||
podman pull git.limbosolutions.com/kb/ssh-server:latest
|
podman pull oci.limbosolutions.com/public/ssh-server:latest
|
||||||
|
|
||||||
podman container run \
|
podman container run \
|
||||||
-p 2222:22 \
|
-p 2222:22 \
|
||||||
@@ -26,14 +26,14 @@ podman container run \
|
|||||||
-v ./local/config:/etc/app/config \
|
-v ./local/config:/etc/app/config \
|
||||||
-v ./local/server-certs:/etc/ssh/certs \
|
-v ./local/server-certs:/etc/ssh/certs \
|
||||||
-v ./local/home:/home \
|
-v ./local/home:/home \
|
||||||
git.limbosolutions.com/kb/ssh-server:latest
|
oci.limbosolutions.com/public/ssh-server:latest
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
## docker
|
## docker
|
||||||
|
|
||||||
``` bash
|
``` bash
|
||||||
docker pull git.limbosolutions.com/kb/ssh-server:latest
|
docker pull oci.limbosolutions.com/public/ssh-server:latest
|
||||||
|
|
||||||
docker container run \
|
docker container run \
|
||||||
-p 2222:22 \
|
-p 2222:22 \
|
||||||
@@ -41,7 +41,7 @@ docker container run \
|
|||||||
-v ./local/config:/etc/app/config \
|
-v ./local/config:/etc/app/config \
|
||||||
-v ./local/server-certs:/etc/ssh/certs \
|
-v ./local/server-certs:/etc/ssh/certs \
|
||||||
-v ./local/home:/home \
|
-v ./local/home:/home \
|
||||||
git.limbosolutions.com/kb/ssh-server:latest
|
oci.limbosolutions.com/public/ssh-server:latest
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -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"
|
BUILD_CLI="docker"
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
FROM ubuntu:22.04
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
# ---------------------------------------------------------
|
|
||||||
# Base dependencies
|
|
||||||
# ---------------------------------------------------------
|
|
||||||
RUN apt-get update && apt-get install -y \
|
|
||||||
tini \
|
|
||||||
curl \
|
|
||||||
wget \
|
|
||||||
jq \
|
|
||||||
bash \
|
|
||||||
tar \
|
|
||||||
rsync \
|
|
||||||
rclone \
|
|
||||||
ansible \
|
|
||||||
openssh-client \
|
|
||||||
iptables \
|
|
||||||
uidmap \
|
|
||||||
slirp4netns \
|
|
||||||
fuse-overlayfs \
|
|
||||||
ca-certificates \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# ---------------------------------------------------------
|
|
||||||
# Install ACT Runner
|
|
||||||
# ---------------------------------------------------------
|
|
||||||
RUN curl -L https://dl.gitea.com/act_runner/0.6.0/act_runner-0.6.0-linux-amd64 \
|
|
||||||
-o /usr/local/bin/act_runner && \
|
|
||||||
chmod +x /usr/local/bin/act_runner
|
|
||||||
|
|
||||||
# ---------------------------------------------------------
|
|
||||||
# Install kubectl
|
|
||||||
# ---------------------------------------------------------
|
|
||||||
RUN curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" && \
|
|
||||||
chmod +x kubectl && mv kubectl /usr/local/bin/
|
|
||||||
|
|
||||||
# ---------------------------------------------------------
|
|
||||||
# Install Helm
|
|
||||||
# ---------------------------------------------------------
|
|
||||||
RUN HELM_VERSION=$(curl -s https://api.github.com/repos/helm/helm/releases/latest | jq -r .tag_name) && \
|
|
||||||
curl -fsSL https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz -o helm.tar.gz && \
|
|
||||||
tar -zxvf helm.tar.gz && \
|
|
||||||
mv linux-amd64/helm /usr/local/bin/helm && \
|
|
||||||
rm -rf linux-amd64 helm.tar.gz
|
|
||||||
|
|
||||||
# ---------------------------------------------------------
|
|
||||||
# Install BuildKit (buildkitd + buildctl)
|
|
||||||
# ---------------------------------------------------------
|
|
||||||
ENV BUILDKIT_VERSION=v0.28.0
|
|
||||||
|
|
||||||
RUN curl -L "https://github.com/moby/buildkit/releases/download/${BUILDKIT_VERSION}/buildkit-${BUILDKIT_VERSION}.linux-amd64.tar.gz" \
|
|
||||||
| tar -xz -C /usr/local/bin --strip-components=1
|
|
||||||
|
|
||||||
# ---------------------------------------------------------
|
|
||||||
# Install rootlesskit (required for BuildKit rootless)
|
|
||||||
# ---------------------------------------------------------
|
|
||||||
RUN curl -L https://github.com/rootless-containers/rootlesskit/releases/download/v1.1.1/rootlesskit-x86_64.tar.gz \
|
|
||||||
| tar -xz -C /usr/local/bin
|
|
||||||
|
|
||||||
# ---------------------------------------------------------
|
|
||||||
# Default entrypoint
|
|
||||||
# ---------------------------------------------------------
|
|
||||||
|
|
||||||
WORKDIR /data
|
|
||||||
ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/act_runner"]
|
|
||||||
CMD ["daemon", "--config", "/etc/act_runner/config.yaml"]
|
|
||||||
Reference in New Issue
Block a user