Skip to content

Commit

Permalink
Merge pull request #6 from roib20/updates
Browse files Browse the repository at this point in the history
Updates
  • Loading branch information
roib20 authored Apr 17, 2024
2 parents b9e9f8a + 3c4f677 commit cefa20e
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 24 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:

strategy:
matrix:
python: ['python:3.10-alpine', 'python:3.11-alpine']
postgres: ['postgres:14-alpine', 'postgres:15-alpine']
python: ['python:3.11-alpine', 'python:3.12-alpine']
postgres: ['postgres:15-alpine', 'postgres:16-alpine']

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
context: .
file: ./Dockerfile
build-args: |
PYTHON_TAG=3.11-alpine
PYTHON_TAG=3.12-alpine
platforms: linux/amd64
pull: false
push: ${{ github.event_name != 'pull_request' }}
Expand Down
2 changes: 1 addition & 1 deletion clean-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ docker compose --file "./docker-compose.yml" down \
if [ "$1" ]; then
PYTHON_TAG=$( echo "$1" | cut -f2 -d ":" )
else
PYTHON_TAG='3.11-alpine'
PYTHON_TAG='3.12-alpine'
fi

if [ "$2" ]; then
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
context: .
dockerfile: Dockerfile
args:
PYTHON_TAG: "${PYTHON_TAG:-3.11-alpine}"
PYTHON_TAG: "${PYTHON_TAG:-3.12-alpine}"
image: "petinvent_app:${APP_TAG:-latest}"
container_name: "petinvent_app"
hostname: "app"
Expand Down
4 changes: 2 additions & 2 deletions env.example
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Docker environment
APP_TAG=test-3.11-alpine
PYTHON_TAG=3.11-alpine
APP_TAG=test-3.12-alpine
PYTHON_TAG=3.12-alpine
POSTGRES_TAG=15-alpine
WSGI_PORT=5000
TZ=Etc/UTC
Expand Down
28 changes: 14 additions & 14 deletions flask_app/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
alembic==1.11.3
autopep8==2.0.0
alembic==1.13.1
autopep8==2.1.0
click==8.1.7
Flask==2.3.3
Flask-Migrate==4.0.4
Flask-SQLAlchemy==3.0.2
greenlet==2.0.2
Flask==3.0.3
Flask-Migrate==4.0.7
Flask-SQLAlchemy==3.1.1
greenlet==3.0.3
gunicorn==22.0.0
itsdangerous==2.1.2
itsdangerous==2.2.0
Jinja2==3.1.3
Mako==1.2.4
MarkupSafe==2.1.3
psycopg2==2.9.7
pycodestyle==2.10.0
Mako==1.3.3
MarkupSafe==2.1.5
psycopg2==2.9.9
pycodestyle==2.11.1
PyMySQL==1.1.0
python-dotenv==1.0.0
SQLAlchemy==1.4.49
python-dotenv==1.0.1
SQLAlchemy==2.0.29
tomli==2.0.1
Werkzeug==2.3.8
Werkzeug==3.0.2
2 changes: 1 addition & 1 deletion tests/docker-run-and-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ docker compose --file "./docker-compose-testing.yml" down \
if [ "$1" ]; then
PYTHON_TAG=$( echo "$1" | cut -f2 -d ":" )
else
PYTHON_TAG='3.11-alpine'
PYTHON_TAG='3.12-alpine'
fi

if [ "$2" ]; then
Expand Down
4 changes: 2 additions & 2 deletions tests/multi-tag.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

/bin/sh ./tests/docker-run-and-test.sh "python:3.10-alpine" "postgres:14-alpine"
/bin/sh ./tests/docker-run-and-test.sh "python:3.10-alpine" "postgres:15-alpine"
/bin/sh ./tests/docker-run-and-test.sh "python:3.11-alpine" "postgres:14-alpine"
/bin/sh ./tests/docker-run-and-test.sh "python:3.11-alpine" "postgres:15-alpine"
/bin/sh ./tests/docker-run-and-test.sh "python:3.12-alpine" "postgres:14-alpine"
/bin/sh ./tests/docker-run-and-test.sh "python:3.12-alpine" "postgres:15-alpine"

0 comments on commit cefa20e

Please sign in to comment.