Skip to content

Use fully qualified image names in docker-compose files #1640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
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: 2 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Changelog
=========


=======
v34.11.0 (2025-05-02)
---------------------

Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ envfile:
@if test -f ${ENV_FILE}; then echo ".env file exists already"; exit 1; fi
@mkdir -p $(shell dirname ${ENV_FILE}) && touch ${ENV_FILE}
@echo SECRET_KEY=\"${GET_SECRET_KEY}\" > ${ENV_FILE}
@echo COMPOSE_PROJECT_NAME=\"scancodeio\" >> ${ENV_FILE}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the Django app .env file. The COMPOSE_PROJECT_NAME value does not seem relevant in that context.


doc8:
@echo "-> Run doc8 validation"
Expand Down
7 changes: 4 additions & 3 deletions docker-compose-offline.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name: scancodeio
services:
db:
image: postgres:13
image: docker.io/library/postgres:13
env_file:
- docker.env
volumes:
- db_data:/var/lib/postgresql/data/

redis:
image: redis
image: docker.io/library/redis:latest
# Enable redis data persistence using the "Append Only File" with the
# default policy of fsync every second. See https://redis.io/topics/persistence
command: redis-server --appendonly yes
Expand Down Expand Up @@ -45,7 +46,7 @@ services:
- web # Ensure that potential db migrations run first

nginx:
image: nginx
image: docker.io/library/nginx:latest
ports:
- 80:80
- 443:443
Expand Down
1 change: 1 addition & 0 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# $ docker compose -f docker-compose.yml -f docker-compose.dev.yml run --rm web bash
# $ SCANCODEIO_TEST_FIXTURES_REGEN=1 ./manage.py test

name: scancodeio
services:
web:
env_file:
Expand Down
1 change: 1 addition & 0 deletions docker-compose.purldb-scan-worker.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include:
- docker-compose.yml

name: scancodeio
services:
purldb_scan_worker:
build: .
Expand Down
9 changes: 5 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: scancodeio
services:
db:
image: postgres:13
image: docker.io/library/postgres:13
env_file:
- docker.env
volumes:
Expand All @@ -9,7 +10,7 @@ services:
restart: always

redis:
image: redis
image: docker.io/library/redis:latest
# Enable redis data persistence using the "Append Only File" with the
# default policy of fsync every second. See https://redis.io/topics/persistence
command: redis-server --appendonly yes
Expand Down Expand Up @@ -54,7 +55,7 @@ services:
- web

nginx:
image: nginx:alpine
image: docker.io/library/nginx:alpine
ports:
- "${NGINX_PUBLISHED_HTTP_PORT:-80}:80"
- "${NGINX_PUBLISHED_HTTPS_PORT:-443}:443"
Expand All @@ -67,7 +68,7 @@ services:
restart: always

clamav:
image: clamav/clamav
image: docker.io/clamav/clamav:latest
volumes:
- clamav_data:/var/lib/clamav
- workspace:/var/scancodeio/workspace/
Expand Down
2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[metadata]
name = scancodeio

version = 34.11.0

license = Apache-2.0
description = Automate software composition analysis pipelines
long_description = file:README.rst
Expand Down
Loading