Skip to content

Commit 6d5ae29

Browse files
authored
Merge pull request #43 from nyu-devops/updates-sp26
Updates for Spring 2026 semester
2 parents 8b1639e + 4cb6d98 commit 6d5ae29

File tree

9 files changed

+907
-731
lines changed

9 files changed

+907
-731
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This image has selenium and chrome driver already installed
2-
FROM rofrano/pipeline-selenium:latest
2+
FROM quay.io/rofrano/pipeline-selenium:sp26
33

44
# Become a regular user for development
55
ARG USERNAME=vscode

.devcontainer/devcontainer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@
8282
"forwardPorts": [8080],
8383
"postCreateCommand": "bash /app/.devcontainer/scripts/setup-lab.sh",
8484
"features": {
85-
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
85+
"ghcr.io/devcontainers/features/docker-in-docker:2": {
86+
"moby": false
87+
},
8688
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {}
8789
}
8890
}

.devcontainer/scripts/install-tools.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
######################################################################
33
# These scripts are meant to be run in user mode as they modify
44
# usr settings line .bashrc and .bash_aliases
5-
# Copyright 2022, 2023 John J. Rofrano All Rights Reserved.
5+
# Copyright 2022, 2026 John J. Rofrano All Rights Reserved.
66
######################################################################
77

88
echo "**********************************************************************"
@@ -13,7 +13,7 @@ ARCH="$(uname -m | sed -e 's/x86_64/amd64/' -e 's/\(arm\)\(64\)\?.*/\1\2/' -e 's
1313
echo "Architecture is:" $ARCH
1414

1515
echo "**********************************************************************"
16-
echo "Installing K3D Kubernetes..."
16+
echo "Installing Rancher K3D Kubernetes..."
1717
echo "**********************************************************************"
1818
curl -s "https://raw.githubusercontent.com/rancher/k3d/main/install.sh" | sudo bash
1919
echo "Creating kc and kns alias for kubectl..."
@@ -24,7 +24,7 @@ sudo sh -c 'echo "127.0.0.1 cluster-registry" >> /etc/hosts'
2424
echo "**********************************************************************"
2525
echo "Installing K9s..."
2626
echo "**********************************************************************"
27-
curl -L -o k9s.tar.gz "https://github.com/derailed/k9s/releases/download/v0.32.5/k9s_Linux_$ARCH.tar.gz"
27+
curl -L -o k9s.tar.gz "https://github.com/derailed/k9s/releases/download/v0.50.18/k9s_Linux_$ARCH.tar.gz"
2828
tar xvzf k9s.tar.gz
2929
sudo install -c -m 0755 k9s /usr/local/bin
3030
rm k9s.tar.gz

.devcontainer/scripts/setup-lab.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [ ! -f .env ]; then
1313
fi
1414

1515
# Pull container images for the lab
16-
docker pull python:3.11-slim
16+
docker pull python:3.12-slim
1717

1818
# Modify /etc/hosts to map the local container registry
1919
echo Setting up cluster-registry...

.github/workflows/bdd-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ permissions:
2222
jobs:
2323
build:
2424
runs-on: ubuntu-latest
25-
container: quay.io/rofrano/pipeline-selenium:sp25
25+
container: quay.io/rofrano/pipeline-selenium:sp26
2626

2727
services:
2828
postgres:

.github/workflows/tdd-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ permissions:
2222
jobs:
2323
build:
2424
runs-on: ubuntu-latest
25-
container: python:3.11-slim
25+
container: python:3.12-slim
2626

2727
services:
2828
postgres:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Create production image
33
##################################################
44
# cSpell: disable
5-
FROM quay.io/rofrano/python:3.11-slim
5+
FROM quay.io/rofrano/python:3.12-slim
66

77
# Set up the Python production environment
88
WORKDIR /app

Pipfile

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,35 @@ verify_ssl = true
44
name = "pypi"
55

66
[packages]
7-
flask = "~=3.1.0"
8-
flask-sqlalchemy = "~=3.1.1"
9-
psycopg = {extras = ["binary"], version = "~=3.2.4"}
10-
retry2 = "~=0.9.5"
11-
python-dotenv = "~=1.0.1"
12-
gunicorn = "~=23.0.0"
7+
flask = "==3.1.2"
8+
flask-sqlalchemy = "==3.1.1"
9+
psycopg = {extras = ["binary"], version = "==3.3.2"}
10+
retry2 = "==0.9.5"
11+
python-dotenv = "~=1.2.1"
12+
gunicorn = "~=25.0.0"
1313

1414
[dev-packages]
15-
honcho = "~=2.0.0"
16-
httpie = "~=3.2.4"
17-
1815
# Code Quality
19-
pylint = "~=3.3.4"
20-
flake8 = "~=7.1.1"
21-
black = "~=25.1.0"
16+
pylint = "~=4.0.4"
17+
flake8 = "~=7.3.0"
18+
black = "~=26.1.0"
2219

2320
# Test-Driven Development
24-
pytest = "~=8.3.4"
21+
pytest = "~=9.0.2"
2522
pytest-pspec = "~=0.0.4"
26-
pytest-cov = "~=6.0.0"
23+
pytest-cov = "~=7.0.0"
2724
factory-boy = "~=3.3.3"
28-
coverage = "~=7.6.12"
25+
coverage = "~=7.13.2"
26+
27+
# Utility
28+
honcho = "~=2.0.0"
29+
httpie = "~=3.2.4"
2930

3031
# Behavior-Driven Development
31-
behave = "~=1.2.6"
32+
behave = "~=1.3.3"
3233
selenium = "==4.16.0" # newer versions do not work
33-
requests = "~=2.31.0"
34+
requests = "~=2.32.5"
3435
compare3 = "~=1.0.4"
3536

3637
[requires]
37-
python_version = "3.11"
38+
python_version = "3.12"

Pipfile.lock

Lines changed: 877 additions & 704 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)