Update .devcontainer/devops-dev/devcontainer.json

modified:   devops/Dockerfile

.devcontainer/devops-dev/devcontainer.json

@@ -38,7 +38,11 @@
 				"m4ns0ur.base64",
 				"rogalmic.bash-debug",
 				"streetsidesoftware.code-spell-checker",
-				"ms-azuretools.vscode-containers"
+				"ms-azuretools.vscode-containers",
+				"eamodio.gitlens",
+				"shd101wyy.markdown-preview-enhanced",
+				"bierner.markdown-mermaid",
+				"bierner.markdown-preview-github-styles"
 			]
 		}
 	}

.gitea/workflows/devops-image-deploy.yaml

@@ -22,6 +22,9 @@ jobs:
           username: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_USERNAME }}
           password: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_PASSWORD }}
 
+      - 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
@@ -29,4 +32,6 @@ jobs:
           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

README.md

@@ -16,9 +16,7 @@ Add a `.devcontainer/devcontainer.json` to your project that points to the publi
 
 ```json
 {
-  "name": "my-project",
+  "image": "git.limbosolutions.com/mylimbo/devcontainers/devops:latest",
-  "image": "ghcr.io/your-org/devops:22.04",
-  "remoteUser": "vscode"
 }
 ```
 

devops/Dockerfile

@@ -38,27 +38,39 @@ RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && npm install -g npm@latest
 
 # --- Install act (GitHub Actions local runner) ---
-RUN curl -s https://api.github.com/repos/nektos/act/releases/latest \
+RUN mkdir /tmp/act \
-    |  grep "browser_download_url.*linux-amd64.*tar.gz" \
+    && curl -s https://api.github.com/repos/nektos/act/releases/latest \
+    | grep "browser_download_url.*act_Linux_x86_64.tar.gz" \
     | cut -d '"' -f 4 \
-    | wget -O /usr/local/bin/act -i - \
+    | wget -O /tmp/act/act.tar.gz -i - \
-    && chmod +x /usr/local/bin/act
+    && tar -xzf /tmp/act/act.tar.gz -C /tmp/act \
+    && install -m 0755 /tmp/act/act /usr/local/bin/act \
+    && rm -r /tmp/act 
 
 # -- install chroma for zsh
-RUN curl -s https://api.github.com/repos/alecthomas/chroma/releases/latest \
+RUN mkdir /tmp/chroma \
+    && curl -s https://api.github.com/repos/alecthomas/chroma/releases/latest \
     | grep "browser_download_url.*linux-amd64.*tar.gz" \
     | cut -d '"' -f 4 \
-    | wget -O /tmp/chroma.tar.gz -i - \
+    | wget -O /tmp/chroma/chroma.tar.gz -i - \
-    && tar -xzf /tmp/chroma.tar.gz -C /usr/local/bin \
+    && tar -xzf /tmp/chroma/chroma.tar.gz -C /tmp/chroma \
-    && chmod +x /usr/local/bin/chroma
+    && install -m 0755 /tmp/chroma/chroma /usr/local/bin/chroma \ 
+    && rm -r /tmp/chroma 
 
-
+# --- set zsh shell as default ---
-
-# --- set zsh shell ---
 RUN chsh -s /usr/bin/zsh vscode
 
 RUN git clone https://github.com/zdharma-continuum/fast-syntax-highlighting.git /home/vscode/.oh-my-zsh/custom/plugins/fast-syntax-highlighting
 RUN git clone https://github.com/zsh-users/zsh-autosuggestions /home/vscode/.oh-my-zsh/custom/plugins/zsh-autosuggestions
 
+# --- pip modules---
+RUN pip install openshift pyyaml
+
+
+# --- copy assets ---
 COPY ./assets/.zshrc /home/vscode
 
+# --- labels ---
+
+
+

devops/templates/devcontainer.json

@@ -1,5 +1,5 @@
 {
-	"image": "https://gitlimbosolutions.com/mf/devcontainers/devops",
+	"image": "git.limbosolutions.com/mylimbo/devcontainers/devops:latest",
 	"remoteUser": "vscode",
 	"name": "devops-devs",
 	"runArgs": [
@@ -18,7 +18,10 @@
 				"m4ns0ur.base64",
 				"rogalmic.bash-debug",
 				"streetsidesoftware.code-spell-checker",
-				"ms-azuretools.vscode-containers"
+				"ms-azuretools.vscode-containers",
+				"eamodio.gitlens",
+				"shd101wyy.markdown-preview-enhanced",
+				"bierner.markdown-preview-github-styles"
 			]
 		}
 	}