Skip to content

Commit 780e963

Browse files
committed
feat: bump image and bump actions versions
1 parent dabb878 commit 780e963

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

.github/workflows/pr.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Set up Docker buildx
12-
uses: docker/setup-buildx-action@v2
12+
uses: docker/setup-buildx-action@v3
1313
- name: Log in to GHCR
14-
uses: docker/login-action@v2
14+
uses: docker/login-action@v3
1515
with:
1616
registry: ghcr.io
1717
username: ${{ github.actor }}
1818
password: ${{ github.token }}
1919
- name: Build image
20-
uses: docker/build-push-action@v3
20+
uses: docker/build-push-action@v5
2121
with:
2222
cache-from: type=gha
2323
platforms: linux/amd64 # GitHub only offers AMD64 codespaces

.github/workflows/release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Set up Docker buildx
16-
uses: docker/setup-buildx-action@v2
16+
uses: docker/setup-buildx-action@v3
1717
- name: Log in to GHCR
18-
uses: docker/login-action@v2
18+
uses: docker/login-action@v3
1919
with:
2020
registry: ghcr.io
2121
username: ${{ github.actor }}
2222
password: ${{ github.token }}
2323
- name: Build and Push
24-
uses: docker/build-push-action@v3
24+
uses: docker/build-push-action@v5
2525
with:
2626
platforms: linux/amd64 # GitHub only offers AMD64 codespaces
2727
pull: true

Dockerfile

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# syntax=docker/dockerfile:1
2-
ARG PYTHON_VERSION="3.11"
2+
ARG PYTHON_VERSION="3.12"
33
FROM mcr.microsoft.com/devcontainers/python:${PYTHON_VERSION}
44

55
LABEL org.opencontainers.image.authors="Ryan Boehning <1250684+ryboe@users.noreply.github.com>"
66

77
RUN <<-EOT
8-
apt update
9-
apt full-upgrade
10-
rm -rf /var/lib/apt/lists/*
8+
apt update
9+
apt full-upgrade
10+
apt clean
11+
rm -rf /var/lib/apt/lists/*
1112
EOT
1213

1314
# Enable pipefail to catch errors.
@@ -17,26 +18,25 @@ SHELL ["/bin/zsh", "-o", "pipefail", "-c"]
1718
RUN sed -i 's/\/home\/vscode:\/bin\/bash/\/home\/vscode:\/bin\/zsh/' /etc/passwd
1819
USER vscode
1920

20-
# Create local bin directory for gh, poetry, and other command line tools.
21-
RUN mkdir -p /home/vscode/.local/bin
22-
ENV PATH="/home/vscode/.local/bin:$PATH"
23-
2421
# Remove shell configs from the base image.
2522
RUN rm -rf ~/.bash_logout ~/.bashrc ~/.oh-my-zsh ~/.profile
2623

27-
# Install the latest gh CLI tool. The first request fetches the URL for the
28-
# latest release tarball. The second request downloads the tarball.
24+
# Create local bin directory for gh, poetry, and other command line tools.
25+
RUN mkdir -p /home/vscode/.local/bin
26+
27+
# Install poetry and enable its completions.
2928
RUN <<-EOT
30-
wget --quiet --timeout=30 --output-document=- 'https://api.github.com/repos/cli/cli/releases/latest' |
31-
jq -r ".assets[] | select(.name | test(\"gh_.*?_linux_amd64.tar.gz\")).browser_download_url" |
32-
wget --quiet --timeout=180 --input-file=- --output-document=- |
33-
tar -xvz -C /home/vscode/.local/ --strip-components=1
29+
curl -sSL https://install.python-poetry.org | python -
30+
mkdir -p ~/.zfunc
31+
poetry completions zsh > ~/.zfunc/_poetrywhic
32+
fpath+=~/.zfunc
3433
EOT
3534

36-
# Install poetry and enable its completions.
35+
# Install the latest gh CLI tool. The first request fetches the URL for the
36+
# latest release tarball. The second request downloads the tarball.
3737
RUN <<-EOT
38-
curl -sSL https://install.python-poetry.org | python -
39-
mkdir -p ~/.zfunc
40-
poetry completions zsh > ~/.zfunc/_poetrywhic
41-
fpath+=~/.zfunc
38+
wget --quiet --timeout=30 --output-document=- 'https://api.github.com/repos/cli/cli/releases/latest' |
39+
jq -r ".assets[] | select(.name | test(\"gh_.*?_linux_amd64.tar.gz\")).browser_download_url" |
40+
wget --quiet --timeout=180 --input-file=- --output-document=- |
41+
tar -xvz -C ~/.local/bin --strip-components=2
4242
EOT

0 commit comments

Comments
 (0)