V0.20.10 (#12)

* add lazygit add quay.io push * correct typo in dockerfile * chore(deps): bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): bump docker/setup-buildx-action from 2 to 3 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](docker/setup-buildx-action@v2...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * replace set-output steps * chore(deps): bump crazy-max/ghaction-github-labeler from 4.1.0 to 5.0.0 Bumps [crazy-max/ghaction-github-labeler](https://github.com/crazy-max/ghaction-github-labeler) from 4.1.0 to 5.0.0. - [Release notes](https://github.com/crazy-max/ghaction-github-labeler/releases) - [Commits](crazy-max/ghaction-github-labeler@v4.1.0...v5.0.0) --- updated-dependencies: - dependency-name: crazy-max/ghaction-github-labeler dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): bump docker/setup-qemu-action from 2 to 3 Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](docker/setup-qemu-action@v2...v3) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): bump docker/build-push-action from 3 to 5 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 5. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v3...v5) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * workflow updates * rename master to main * update remaining workflows --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
kbuley · Dec 21, 2023 · 3e864cf · 3e864cf
1 parent b00dbf4
commit 3e864cf
Show file tree

Hide file tree

Showing 9 changed files with 93 additions and 59 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,12 +4,12 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
   - package-ecosystem: docker
-    directory: /
+    directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
   - package-ecosystem: gomod
-    directory: /
+    directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
@@ -21,7 +21,7 @@ jobs:
     env:
       DOCKER_BUILDKIT: "1"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Build image
         run: docker build -f alpine.Dockerfile -t kbuley/basedevcontainer .
@@ -31,37 +31,44 @@ jobs:
     if: github.event_name == 'push'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: docker/setup-qemu-action@v3
-      - uses: docker/setup-buildx-action@v2
 
-      - uses: docker/login-action@v2
+      - uses: docker/setup-buildx-action@v3
+
+      - uses: docker/login-action@v3
         with:
           username: kbuley
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
+      - uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: kbuley+github
+          password: ${{ secrets.QUAY_PASSWORD }}
+
       - name: Set variables
         id: vars
         env:
           EVENT_NAME: ${{ github.event_name }}
         run: |
           BRANCH=${GITHUB_REF#refs/heads/}
           TAG=${GITHUB_REF#refs/tags/}
-          echo ::set-output name=commit::$(git rev-parse --short HEAD)
-          echo ::set-output name=created::$(date -u +%Y-%m-%dT%H:%M:%SZ)
+          echo "commit=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          echo "create=$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> $GITHUB_OUTPUT
           if [ "$TAG" != "$GITHUB_REF" ]; then
-            echo ::set-output name=version::$TAG
-            echo ::set-output name=alpine_version::$TAG-alpine
-            echo ::set-output name=platforms::linux/amd64,linux/arm64
-          elif [ "$BRANCH" = "master" ]; then
-            echo ::set-output name=version::latest
-            echo ::set-output name=alpine_version::alpine
-            echo ::set-output name=platforms::linux/amd64,linux/arm64
+            echo "version=$TAG" >> $GITHUB_OUTPUT
+            echo "alpine_version=$TAG-alpine" >> $GITHUB_OUTPUT
+            echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
+          elif [ "$BRANCH" = "main" ]; then
+            echo "version=latest" >> $GITHUB_OUTPUT
+            echo "alpine_version=alpine" >> $GITHUB_OUTPUT
+            echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
           else
-            echo ::set-output name=version::$BRANCH
-            echo ::set-output name=alpine_version::$BRANCH-alpine
-            echo ::set-output name=platforms::linux/amd64,linux/arm64
+            echo "version=$BRANCH" >> $GITHUB_OUTPUT
+            echo "alpine_version=$BRANCH-alpine" >> $GITHUB_OUTPUT
+            echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
           fi
 
       - name: Build and push final image
@@ -76,4 +83,6 @@ jobs:
           tags: |
             kbuley/basedevcontainer:${{ steps.vars.outputs.version }}
             kbuley/basedevcontainer:${{ steps.vars.outputs.alpine_version }}
+            quay.io/kbuley/basedevcontainer:${{ steps.vars.outputs.version }}
+            quay.io/kbuley/basedevcontainer:${{ steps.vars.outputs.alpine_version }}
           push: true
diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
@@ -21,7 +21,7 @@ jobs:
     env:
       DOCKER_BUILDKIT: "1"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Build image
         run: docker build -f debian.Dockerfile -t kbuley/basedevcontainer .
@@ -31,37 +31,44 @@ jobs:
     if: github.event_name == 'push'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: docker/setup-qemu-action@v3
-      - uses: docker/setup-buildx-action@v2
+
+      - uses: docker/setup-buildx-action@v3
 
-      - uses: docker/login-action@v2
+      - uses: docker/login-action@v3
         with:
           username: kbuley
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
+      - uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: kbuley+github
+          password: ${{ secrets.QUAY_PASSWORD }}
+
       - name: Set variables
         id: vars
         env:
           EVENT_NAME: ${{ github.event_name }}
         run: |
           BRANCH=${GITHUB_REF#refs/heads/}
           TAG=${GITHUB_REF#refs/tags/}
-          echo ::set-output name=commit::$(git rev-parse --short HEAD)
-          echo ::set-output name=created::$(date -u +%Y-%m-%dT%H:%M:%SZ)
+          echo "commit=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          echo "create=$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> $GITHUB_OUTPUT
           if [ "$TAG" != "$GITHUB_REF" ]; then
-            echo ::set-output name=version::$TAG
-            echo ::set-output name=debian_version::$TAG-debian
-            echo ::set-output name=platforms::linux/amd64,linux/arm64
-          elif [ "$BRANCH" = "master" ]; then
-            echo ::set-output name=version::latest
-            echo ::set-output name=debian_version::debian
-            echo ::set-output name=platforms::linux/amd64,linux/arm64
+            echo "version=$TAG" >> $GITHUB_OUTPUT
+            echo "debian_version=$TAG-debian" >> $GITHUB_OUTPUT
+            echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
+          elif [ "$BRANCH" = "main" ]; then
+            echo "version=latest" >> $GITHUB_OUTPUT
+            echo "debian_version=debian" >> $GITHUB_OUTPUT
+            echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
           else
-            echo ::set-output name=version::$BRANCH
-            echo ::set-output name=debian_version::$BRANCH-debian
-            echo ::set-output name=platforms::linux/amd64,linux/arm64
+            echo "version=$BRANCH" >> $GITHUB_OUTPUT
+            echo "debian_version=$BRANCH-debian" >> $GITHUB_OUTPUT
+            echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
           fi
 
       - name: Build and push final image
@@ -75,4 +82,5 @@ jobs:
             VERSION=${{ steps.vars.outputs.version }}
           tags: |
             kbuley/basedevcontainer:${{ steps.vars.outputs.debian_version }}
+            quay.io/kbuley/basedevcontainer:${{ steps.vars.outputs.debian_version }}
           push: true
diff --git a/.github/workflows/dockerhub-description.yml b/.github/workflows/dockerhub-description.yml
@@ -1,7 +1,7 @@
 name: Docker Hub description
 on:
   push:
-    branches: [master]
+    branches: ["main"]
     paths:
       - README.md
       - .github/workflows/dockerhub-description.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Docker Hub Description
         uses: peter-evans/dockerhub-description@v3
         with:

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
@@ -1,17 +1,17 @@
 name: labels
 on:
   push:
-    branches: ["master"]
+    branches: ["main"]
     paths:
-      - '.github/labels.yml'
-      - '.github/workflows/labels.yml'
+      - ".github/labels.yml"
+      - ".github/workflows/labels.yml"
   workflow_dispatch:
 jobs:
   labeler:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Labeler
         if: success()
         uses: crazy-max/ghaction-github-labeler@v5.0.0

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -21,7 +21,7 @@ jobs:
     env:
       DOCKER_BUILDKIT: "1"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Build image
         run: docker build -f ubuntu.Dockerfile -t kbuley/basedevcontainer .
@@ -31,37 +31,44 @@ jobs:
     if: github.event_name == 'push'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: docker/setup-qemu-action@v3
-      - uses: docker/setup-buildx-action@v2
 
-      - uses: docker/login-action@v2
+      - uses: docker/setup-buildx-action@v3
+
+      - uses: docker/login-action@v3
         with:
           username: kbuley
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
+      - uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: kbuley+github
+          password: ${{ secrets.QUAY_PASSWORD }}
+
       - name: Set variables
         id: vars
         env:
           EVENT_NAME: ${{ github.event_name }}
         run: |
           BRANCH=${GITHUB_REF#refs/heads/}
           TAG=${GITHUB_REF#refs/tags/}
-          echo ::set-output name=commit::$(git rev-parse --short HEAD)
-          echo ::set-output name=created::$(date -u +%Y-%m-%dT%H:%M:%SZ)
+          echo "commit=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          echo "create=$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> $GITHUB_OUTPUT
           if [ "$TAG" != "$GITHUB_REF" ]; then
-            echo ::set-output name=version::$TAG
-            echo ::set-output name=ubuntu_version::$TAG-ubuntu
-            echo ::set-output name=platforms::linux/amd64,linux/arm64
-          elif [ "$BRANCH" = "master" ]; then
-            echo ::set-output name=version::latest
-            echo ::set-output name=ubuntu_version::ubuntu
-            echo ::set-output name=platforms::linux/amd64,linux/arm64
+            echo "version=$TAG" >> $GITHUB_OUTPUT
+            echo "ubuntu_version=$TAG-ubuntu" >> $GITHUB_OUTPUT
+            echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
+          elif [ "$BRANCH" = "main" ]; then
+            echo "version=latest" >> $GITHUB_OUTPUT
+            echo "ubuntu_version=ubuntu" >> $GITHUB_OUTPUT
+            echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
           else
-            echo ::set-output name=version::$BRANCH
-            echo ::set-output name=ubuntu_version::$BRANCH-ubuntu
-            echo ::set-output name=platforms::linux/amd64,linux/arm64
+            echo "version=$BRANCH" >> $GITHUB_OUTPUT
+            echo "ubuntu_version=$BRANCH-ubuntu" >> $GITHUB_OUTPUT
+            echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
           fi
 
       - name: Build and push final image
@@ -75,4 +82,5 @@ jobs:
             VERSION=${{ steps.vars.outputs.version }}
           tags: |
             kbuley/basedevcontainer:${{ steps.vars.outputs.ubuntu_version }}
+            quay.io/kbuley/basedevcontainer:${{ steps.vars.outputs.ubuntu_version }}
           push: true
diff --git a/alpine.Dockerfile b/alpine.Dockerfile
@@ -3,10 +3,12 @@ ARG ALPINE_VERSION=3.19
 ARG LOGOLS_VERSION=v1.3.7
 ARG BIT_VERSION=v1.1.2
 ARG GH_VERSION=v2.40.1
+ARG LAZYGIT_VERSION=v0.40.2
 
 FROM kbuley/binpot:logo-ls-${LOGOLS_VERSION} AS logo-ls
 FROM kbuley/binpot:bit-${BIT_VERSION} AS bit
 FROM kbuley/binpot:gh-${GH_VERSION} AS gh
+FROM kbuley/binpot:lazygit-${LAZYGIT_VERSION} as lazygit
 
 FROM alpine:${ALPINE_VERSION} as neovim
 ARG NEOVIM_VERSION=v0.9.4
@@ -72,6 +74,7 @@ RUN case "${TARGETARCH}" in \
 COPY --from=bit --chmod=755 /bin /usr/local/bin/bit
 COPY --from=logo-ls --chmod=755 /bin /usr/local/bin/logo-ls
 COPY --from=gh --chmod=755 /bin /usr/local/bin/gh
+COPY --from=lazygit --chmod=755 /bin /usr/local/bin/lazygit
 
 USER ${USERNAME}
 

diff --git a/debian.Dockerfile b/debian.Dockerfile
@@ -3,10 +3,12 @@ ARG DEBIAN_VERSION=bookworm-slim
 ARG LOGOLS_VERSION=v1.3.7
 ARG BIT_VERSION=v1.1.2
 ARG GH_VERSION=v2.21.1
+ARG LAZYGIT_VERSION=v0.40.2
 
 FROM kbuley/binpot:logo-ls-${LOGOLS_VERSION} AS logo-ls
 FROM kbuley/binpot:bit-${BIT_VERSION} AS bit
 FROM kbuley/binpot:gh-${GH_VERSION} AS gh
+FROM kbuley/binpot:lazygit-${LAZYGIT_VERSION} as lazygit
 
 FROM debian:${DEBIAN_VERSION} as neovim
 ARG NEOVIM_VERSION=v0.9.4
@@ -83,6 +85,7 @@ COPY --chown=${USERNAME}:${USERNAME} shell/.p10k.zsh /home/${USERNAME}/
 
 # Logo ls
 COPY --from=logo-ls --chmod=755 /bin /usr/local/bin/logo-ls
+COPY --from=lazygit --chmod=755 /bin /usr/local/bin/lazygit
 
 # Bit
 COPY --from=bit --chmod=755 /bin /usr/local/bin/bit

diff --git a/ubuntu.Dockerfile b/ubuntu.Dockerfile
@@ -3,10 +3,12 @@ ARG UBUNTU_VERSION=latest
 ARG LOGOLS_VERSION=v1.3.7
 ARG BIT_VERSION=v1.1.2
 ARG GH_VERSION=v2.40.1
+ARG LAZYGIT_VERSION=v0.40.2
 
 FROM kbuley/binpot:logo-ls-${LOGOLS_VERSION} AS logo-ls
 FROM kbuley/binpot:bit-${BIT_VERSION} AS bit
 FROM kbuley/binpot:gh-${GH_VERSION} AS gh
+FROM kbuley/binpot:lazygit-${LAZYGIT_VERSION} as lazygit
 
 FROM ubuntu:${UBUNTU_VERSION} as neovim
 ARG NEOVIM_VERSION=v0.9.4
@@ -93,6 +95,7 @@ COPY --chown=${USERNAME}:${USERNAME} shell/.zshrc /home/${USERNAME}/
 
 # Logo ls
 COPY --from=logo-ls --chmod=755 /bin /usr/local/bin/logo-ls
+COPY --from=lazygit --chmod=755 /bin /usr/local/bin/lazygit
 
 # Bit
 COPY --from=bit --chmod=755 /bin /usr/local/bin/bit