Skip to content

Commit 6d8cae8

Browse files
tdruezModel Monstermodelmonster
authored
Use fully qualified image names in docker-compose files (#1745)
* Refine the scan_single_package pipeline to work on git inputs #1376 (#1636) Signed-off-by: tdruez <[email protected]> Signed-off-by: Model Monster <[email protected]> * Bump version for v34.10.0 release (#1637) Signed-off-by: tdruez <[email protected]> Signed-off-by: Model Monster <[email protected]> * Truncate the task output in get_slack_payload to block message limit Signed-off-by: tdruez <[email protected]> Signed-off-by: Model Monster <[email protected]> * Use fully qualified image names in docker-compose files Signed-off-by: Model Monster <[email protected]> * Add name property to docker-compose files to ensure consistent container naming Signed-off-by: Model Monster <[email protected]> * Add COMPOSE_PROJECT_NAME to .env file creation Signed-off-by: Model Monster <[email protected]> * Remove diff leftover Signed-off-by: tdruez <[email protected]> --------- Signed-off-by: tdruez <[email protected]> Signed-off-by: Model Monster <[email protected]> Co-authored-by: Model Monster <[email protected]> Co-authored-by: modelmonster <[email protected]>
1 parent 8a89267 commit 6d8cae8

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

docker-compose-offline.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1+
name: scancodeio
12
services:
23
db:
3-
image: postgres:13
4+
image: docker.io/library/postgres:13
45
env_file:
56
- docker.env
67
volumes:
78
- db_data:/var/lib/postgresql/data/
89

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

4748
nginx:
48-
image: nginx
49+
image: docker.io/library/nginx:latest
4950
ports:
5051
- 80:80
5152
- 443:443

docker-compose.dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
# $ docker compose -f docker-compose.yml -f docker-compose.dev.yml run --rm web bash
77
# $ SCANCODEIO_TEST_FIXTURES_REGEN=1 ./manage.py test
88

9+
name: scancodeio
910
services:
1011
web:
1112
env_file:

docker-compose.purldb-scan-worker.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
include:
22
- docker-compose.yml
33

4+
name: scancodeio
45
services:
56
purldb_scan_worker:
67
build: .

docker-compose.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
name: scancodeio
12
services:
23
db:
3-
image: postgres:13
4+
image: docker.io/library/postgres:13
45
env_file:
56
- docker.env
67
volumes:
@@ -9,7 +10,7 @@ services:
910
restart: always
1011

1112
redis:
12-
image: redis
13+
image: docker.io/library/redis:latest
1314
# Enable redis data persistence using the "Append Only File" with the
1415
# default policy of fsync every second. See https://redis.io/topics/persistence
1516
command: redis-server --appendonly yes
@@ -54,7 +55,7 @@ services:
5455
- web
5556

5657
nginx:
57-
image: nginx:alpine
58+
image: docker.io/library/nginx:alpine
5859
ports:
5960
- "${NGINX_PUBLISHED_HTTP_PORT:-80}:80"
6061
- "${NGINX_PUBLISHED_HTTPS_PORT:-443}:443"
@@ -67,7 +68,7 @@ services:
6768
restart: always
6869

6970
clamav:
70-
image: clamav/clamav
71+
image: docker.io/clamav/clamav:latest
7172
volumes:
7273
- clamav_data:/var/lib/clamav
7374
- workspace:/var/scancodeio/workspace/

0 commit comments

Comments
 (0)