Skip to content

Commit

Permalink
fix: Docker image tag and name
Browse files Browse the repository at this point in the history
  • Loading branch information
Quentinchampenois committed Jan 24, 2025
1 parent 0417302 commit 152c166
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,6 @@ README.md
Dockerfile
docker-compose.yml
OVERLOADS.md
Makefile
Makefile

backups
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
image_name = decidim-app
image_tag = 3.0.0

run: up
@make create-seeds

Expand All @@ -6,7 +9,7 @@ up: build
@make setup-database

build:
docker build . -t decidim-lite:1.0.0
docker build . -t "$(image_name):$(image_tag)"

# Stops containers and remove volumes
teardown:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ def up
bg_color: colors[:red][:background], text_color: colors[:red][:foreground]
)
# rubocop:enable Rails/SkipsModelValidations
rescue ActiveModel::UnknownAttributeError
# Skip migration
end

def down
Expand Down
5 changes: 2 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ services:
/usr/bin/mc alias set local http://minio:9000 minioadmin minioadmin &&
/usr/bin/mc mb --ignore-existing local/mybucket &&
/usr/bin/mc anonymous set public local/mybucket &&
/usr/bin/mc admin config set local/ cors="*" &&
/usr/bin/mc admin service restart local &&
echo 'Bucket mybucket created and set to public!';
exit 0;
Expand All @@ -49,7 +48,7 @@ services:
- redis-data:/var/lib/redis/data

sidekiq:
image: decidim-lite:1.0.0
image: decidim-app:3.0.0
command: [ "bundle", "exec", "sidekiq", "-C", "config/sidekiq.yml" ]
environment:
- DATABASE_HOST=database
Expand Down Expand Up @@ -91,7 +90,7 @@ services:
- redis

app:
image: decidim-lite:1.0.0
image: decidim-app:3.0.0
command: [ "bundle", "exec", "rails", "server", "-b", "ssl://0.0.0.0:3000?key=/decidim/tls-certificate/key.pem&cert=/decidim/tls-certificate/cert.pem" ]
environment:
- DATABASE_HOST=database
Expand Down

0 comments on commit 152c166

Please sign in to comment.