moved to oci.limbosolutions.com, add buildkit

2026-05-03 10:50:47 +00:00
parent bf36e0e034
commit f0c62ba8cc
6 changed files with 49 additions and 55 deletions
@@ -1,53 +0,0 @@
-on: 
-  push:
-    branches:
-      - main
-  schedule:
-    - cron: '@weekly'     # once per week
-    
-jobs:
- 
-  build-push-container-image:
-    runs-on: ["oci-image-builder", "amd64"]
-
-    steps:
-
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Fetch limbo public actions
-        env: 
-          RUNNER_TEMP: "${{ runner.temp }}"
-          WORKSPACE: "${{ gitea.workspace }}"
-        run: |
-          curl -fsSL https://git.limbosolutions.com/kb/gitea/raw/branch/main/cloud-scripts/setup-limbo-actions.sh | bash 2>&1
-  
-   
-      - name: Build and push Image
-        uses: ./.gitea/limbo_actions/buildkit-build-push
-        with:
-          registry_addr: ${{ vars.GITLIMBO_DOCKER_REGISTRY_ADDRESS }}
-          registry_username: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_USERNAME }}
-          registry_password: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_PASSWORD }}
-          buildkit_addr: ${{ vars.BUILDKIT_ADDRESS }}
-          dockerfile:  ${{gitea.workspace}}/devops
-          context: ${{gitea.workspace}}/devops
-          tags: git.limbosolutions.com/mylimbo/devcontainers/devops:latest
-
-
-
-      # evidence of previously setting labels during build
-      
-      # - name: Set build timestamp
-      #   run: echo "BUILD_TIMESTAMP=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
-
-      # - name: Build and push Docker images
-      #   id: push
-      #   uses: docker/build-push-action@v6
-      #   with:
-      #     context: ${{gitea.workspace}}/devops
-      #     file: ${{gitea.workspace}}/devops/Dockerfile
-      #     push: true
-      #     labels: |
-      #       dev.containers.timestamp=${{ env.BUILD_TIMESTAMP }}
-      #     tags: git.limbosolutions.com/mylimbo/devcontainers/devops:latest
@@ -0,0 +1,35 @@
+on: 
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: '@weekly'     # once per week
+    
+jobs:
+ 
+  build-push-image:
+    runs-on: ["oci-image-builder", "amd64"]
+
+    steps:
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Fetch limbo public actions
+        env: 
+          RUNNER_TEMP: "${{ runner.temp }}"
+          WORKSPACE: "${{ gitea.workspace }}"
+        run: |
+          curl -fsSL https://git.limbosolutions.com/kb/gitea/raw/branch/main/cloud-scripts/setup-limbo-actions.sh | bash 2>&1
+  
+   
+      - name: Build and push Image
+        uses: ./.gitea/limbo_actions/buildkit-build-push
+        with:
+          registry_addr: ${{ vars.OCI_LIMBO_REGISTRY_ADDRESS }}
+          registry_username: ${{ secrets.OCI_LIMBO_REGISTRY_PUBLIC_USERNAME }}
+          registry_password: ${{ secrets.OCI_LIMBO_REGISTRY_PUBLIC_PASSWORD }}
+          buildkit_addr: ${{ vars.BUILDKIT_ADDRESS }}
+          dockerfile:  ${{gitea.workspace}}/devops
+          context: ${{gitea.workspace}}/devops
+          tags: oci.limbosolutions.com/devcontainers/devops:latest
@@ -0,0 +1,5 @@
+{
+    "cSpell.words": [
+        "BUILDKIT"
+    ]
+}
@@ -16,7 +16,7 @@ Add a `.devcontainer/devcontainer.json` to your project that points to the publi

 ```json
 {
-  "image": "git.limbosolutions.com/mylimbo/devcontainers/devops:latest",
+  "image": "oci.limbosolutions.com/devcontainers/devops:latest",
 }
 ```

@@ -83,4 +83,11 @@ RUN chsh -s /usr/bin/zsh vscode
 COPY ./assets/.zshrc /home/vscode


+#----- buildctl
+ENV BUILDKIT_VERSION=v0.29.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=2 buildkit-${BUILDKIT_VERSION}.linux-amd64/bin/buildctl
+
+
+

@@ -1,5 +1,5 @@
 {
-	"image": "git.limbosolutions.com/mylimbo/devcontainers/devops:latest",
+	"image": "oci.limbosolutions.com/devcontainers/devops:latest",
 	"remoteUser": "vscode",
 	"name": "devops-devs",
 	"runArgs": [