diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index f0ad6dd..5e0ea05 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,5 +1,8 @@ +################################################## # Image for a Python 3 development environment -FROM quay.io/rofrano/python:3.11-slim +################################################## +# cSpell: disable +FROM quay.io/rofrano/python:3.12-slim # Add any tools that are needed beyond Python 3.11 RUN apt-get update && \ diff --git a/.devcontainer/scripts/install-tools.sh b/.devcontainer/scripts/install-tools.sh index 5ecc7c5..542b6d5 100644 --- a/.devcontainer/scripts/install-tools.sh +++ b/.devcontainer/scripts/install-tools.sh @@ -24,7 +24,7 @@ sudo sh -c 'echo "127.0.0.1 cluster-registry" >> /etc/hosts' echo "**********************************************************************" echo "Installing K9s..." echo "**********************************************************************" -curl -L -o k9s.tar.gz "https://github.com/derailed/k9s/releases/download/v0.32.7/k9s_Linux_$ARCH.tar.gz" +curl -L -o k9s.tar.gz "https://github.com/derailed/k9s/releases/download/v0.50.16/k9s_Linux_$ARCH.tar.gz" tar xvzf k9s.tar.gz sudo install -c -m 0755 k9s /usr/local/bin rm k9s.tar.gz @@ -44,7 +44,7 @@ sudo install -c -m 0755 devspace /usr/local/bin echo "**********************************************************************" echo "Installing Stern..." echo "**********************************************************************" -curl -L -o stern.tar.gz "https://github.com/stern/stern/releases/download/v1.32.0/stern_1.32.0_linux_$ARCH.tar.gz" +curl -L -o stern.tar.gz "https://github.com/stern/stern/releases/download/v1.33.0/stern_1.32.0_linux_$ARCH.tar.gz" tar xvzf stern.tar.gz sudo install -c -m 0755 stern /usr/local/bin rm stern.tar.gz LICENSE @@ -52,7 +52,7 @@ rm stern.tar.gz LICENSE echo "**********************************************************************" echo "Installing Knative CLI..." echo "**********************************************************************" -curl -L -o kn "https://github.com/knative/client/releases/download/knative-v1.17.0/kn-linux-$ARCH" +curl -L -o kn "https://github.com/knative/client/releases/download/knative-v1.20.0/kn-linux-$ARCH" sudo install -c -m 0755 kn /usr/local/bin rm kn @@ -60,9 +60,9 @@ echo "**********************************************************************" echo "Installing Tekton CLI..." echo "**********************************************************************" if [ $ARCH == amd64 ]; then - curl -L https://github.com/tektoncd/cli/releases/download/v0.39.1/tkn_0.39.1_Linux_x86_64.tar.gz --output tekton.tar.gz + curl -L https://github.com/tektoncd/cli/releases/download/v0.42.0/tkn_0.42.0_Linux_x86_64.tar.gz --output tekton.tar.gz else - curl -L https://github.com/tektoncd/cli/releases/download/v0.39.1/tkn_0.39.1_Linux_aarch64.tar.gz --output tekton.tar.gz + curl -L https://github.com/tektoncd/cli/releases/download/v0.42.0/tkn_0.42.0_Linux_aarch64.tar.gz --output tekton.tar.gz fi; tar xvzf tekton.tar.gz tkn sudo install -c -m 0755 tkn /usr/local/bin diff --git a/.devcontainer/scripts/setup-lab.sh b/.devcontainer/scripts/setup-lab.sh index 9f3d2ca..a5d4ab1 100644 --- a/.devcontainer/scripts/setup-lab.sh +++ b/.devcontainer/scripts/setup-lab.sh @@ -3,8 +3,8 @@ echo "**********************************************************************" echo "Setting up OpenShift lab environment..." echo "**********************************************************************\n" -echo "Pulling custom Python:3.11-slim image from quay.io..." -docker pull quay.io/rofrano/python:3.11-slim +echo "Pulling custom Python:3.12-slim image from quay.io..." +docker pull quay.io/rofrano/python:3.12-slim # docker run -d --name postgresql --restart always -p 5432:5432 -v postgres:/var/lib/postgresql/data postgres:alpine echo "Setting up registry.local..." diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1a6568..09889a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,11 +14,15 @@ on: - 'README.md' - '.vscode/**' +permissions: + contents: read + pull-requests: write + jobs: build: runs-on: ubuntu-latest # use a known build environment - container: python:3.11-slim + container: quay.io/rofrano/python:3.12-slim # Required services services: @@ -60,5 +64,11 @@ jobs: DATABASE_URI: "postgresql+psycopg://postgres:pgs3cr3t@postgres:5432/testdb" FLASK_APP: "wsgi:app" - - name: Upload code coverage - uses: codecov/codecov-action@v3.1.4 + - name: Install packages for Codecov to work + run: apt update && apt install -y git curl gpg + + - name: Upload coverage reports to Codecov + uses: codecov/codecov-action@v5 + with: + token: ${{ secrets.CODECOV_TOKEN }} + slug: nyu-devops/lab-openshift diff --git a/Dockerfile b/Dockerfile index d6c886e..703dafe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ################################################## # Create production image ################################################## -FROM quay.io/rofrano/python:3.11-slim +FROM quay.io/rofrano/python:3.12-slim # Set up the Python production environment WORKDIR /app