Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Image for a Python 3 development environment
FROM quay.io/rofrano/nyu-devops-base:su25
FROM quay.io/rofrano/nyu-devops-base:sp26

ARG USERNAME=vscode

Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@
},
// "forwardPorts": [8000],
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
"ghcr.io/devcontainers/features/docker-in-docker:2": {
"moby": false
}
},
"postCreateCommand": "bash /app/.devcontainer/scripts/setup-lab.sh"
}
2 changes: 1 addition & 1 deletion .devcontainer/scripts/setup-lab.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
echo "Setting up Docker lab environment..."
docker pull redis:6-alpine
docker pull python:3.11-slim
docker pull python:3.12-slim
docker run --restart=always -d --name redis -p 6379:6379 -v redis:/data redis:6-alpine
echo "Setup complete"
12 changes: 9 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest
container: python:3.11-slim
container: python:3.12-slim

# Required services
services:
Expand Down Expand Up @@ -48,5 +48,11 @@ jobs:
env:
DATABASE_URI: "redis://redis:6379/0"

- 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-docker
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11-slim
FROM python:3.12-slim

# Create working folder and install dependencies
WORKDIR /app
Expand Down
27 changes: 16 additions & 11 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,29 @@ verify_ssl = true
name = "pypi"

[packages]
flask = "==3.1.1"
redis = "==5.2.1"
flask = "==3.1.2"
redis = "==7.1.0"
flask-redis = "==0.4.0"
retry2 = "==0.9.5"
python-dotenv = "~=1.1.0"
gunicorn = "~=23.0.0"
python-dotenv = "~=1.2.1"
gunicorn = "~=25.0.0"

[dev-packages]
black = "~=25.1.0"
coverage = "~=7.8.2"
flake8 = "~=7.2.0"
pylint = "~=3.3.7"
pytest = "~=8.3.5"
# Code Quality
pylint = "~=4.0.4"
flake8 = "~=7.3.0"
black = "~=26.1.0"

# Test-Driven Development
pytest = "~=9.0.2"
pytest-pspec = "~=0.0.4"
pytest-cov = "~=6.1.1"
pytest-cov = "~=7.0.0"
factory-boy = "~=3.3.3"
coverage = "~=7.13.2"

# Utility
honcho = "~=2.0.0"
httpie = "~=3.2.4"

[requires]
python_version = "3.11"
python_version = "3.12"
951 changes: 540 additions & 411 deletions Pipfile.lock

Large diffs are not rendered by default.