Minor changes

Author: vtm9

Makefile

@@ -1,7 +1,7 @@
 include make-compose.mk
 
 pg:
-	podman-compose up -d db-local
+	docker compose up -d db-local
 
 clean:
 	rm -rf services/app/_build
@@ -18,12 +18,12 @@ test-code-checkers:
 	make -C ./services/app/ test-code-checkers
 
 terraform-vars-generate:
-	podman run --rm -it -v $(CURDIR):/app -w /app williamyeh/ansible:alpine3 ansible-playbook ansible/terraform.yml -i ansible/production -vv --vault-password-file=tmp/ansible-vault-password
+	docker run --rm -it -v $(CURDIR):/app -w /app williamyeh/ansible:alpine3 ansible-playbook ansible/terraform.yml -i ansible/production -vv --vault-password-file=tmp/ansible-vault-password
 
 setup: setup-env compose-setup
 
 setup-env:
-	podman run --rm -v $(CURDIR):/app -w /app williamyeh/ansible:alpine3 ansible-playbook ansible/development.yml -i ansible/development -vv
+	docker run --rm -v $(CURDIR):/app -w /app williamyeh/ansible:alpine3 ansible-playbook ansible/development.yml -i ansible/development -vv
 
 setup-env-local:
 	ansible-playbook ansible/development.yml -i ansible/development -vv
@@ -32,7 +32,7 @@ ansible-edit-secrets:
 	ansible-vault edit --vault-password-file tmp/ansible-vault-password ansible/production/group_vars/all/vault.yml
 
 ansible-vault-edit-production:
-	podman run --rm -it -v $(CURDIR):/app -w /app williamyeh/ansible:alpine3 ansible-vault edit --vault-password-file tmp/ansible-vault-password ansible/production/group_vars/all/vault.yml
+	docker run --rm -it -v $(CURDIR):/app -w /app williamyeh/ansible:alpine3 ansible-vault edit --vault-password-file tmp/ansible-vault-password ansible/production/group_vars/all/vault.yml
 
 release:
 	make -C services/app release

README.md

@@ -19,7 +19,7 @@ This project exists thanks to all the people who contribute. [Contribute guideli
 ### Requirements
 
 - Mac / Linux
-- podman
+- Docker
 
 ### Install
 
@@ -84,82 +84,60 @@ $ mix asserts.upload # Pulls from battle_asserts all issues and upserts into DB
 
 #### macOS
 
-- Install podman
+- Install Docker
 
-Make sure you have installed `podman` for macOS.
+Make sure you have installed Docker Desktop for macOS.
 
 ```bash
-brew install podman
+brew install --cask docker
 ```
 
-Or follow the official installation guide: https://podman.io/getting-started/installation
+Or download Docker Desktop directly from: https://www.docker.com/products/docker-desktop
 
-- Initialize and start podman machine
+- Start Docker Desktop
 
-On macOS, podman requires a virtual machine to run containers. Initialize and start it:
+Launch Docker Desktop from your Applications folder. The Docker icon will appear in your menu bar when it's running.
 
-```bash
-podman machine init --memory=8192
-podman machine start
-```
-
-If you encounter issues, try removing and reinitializing the machine:
-
-```bash
-podman machine stop
-podman machine rm
-podman machine init
-podman machine start
-```
+If you encounter issues, try restarting Docker Desktop from the menu bar icon or your Applications folder.
 
-- Set podman machine to start automatically
-
-To have the podman machine start automatically on boot:
-
-```bash
-podman machine set --rootful=false
-```
-
-Close and open your terminal if podman didn't start immediately.
+Docker Desktop will start automatically on boot by default. You can change this in Docker Desktop preferences if needed.
 
 #### Linux
 
-- Install podman
+- Install Docker
 
-Make sure you have installed `podman` for your Linux distribution.
+Make sure you have installed Docker Engine for your Linux distribution.
 
-https://podman.io/getting-started/installation
+Follow the official installation guide: https://docs.docker.com/engine/install/
 
-- Start podman service
+- Start Docker service
 
-Make sure podman is running. You can start the podman service manually by typing:
+Make sure Docker is running. You can start the Docker service manually by typing:
 
 ```bash
-sudo systemctl start podman
+sudo systemctl start docker
 ```
 
 or you can add it to startup by typing:
 
 ```bash
-sudo systemctl enable podman
+sudo systemctl enable docker
 ```
 
-Close and open your terminal if podman didn't start immediately.
-
-- Running podman in rootless mode
+- Add your user to the docker group
 
-Podman can run containers without root privileges by default. If you encounter permission issues, ensure your user is set up for rootless podman:
+To run Docker without sudo, add your user to the docker group:
 
-https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md
+```bash
+sudo usermod -aG docker $USER
+```
 
-You may need to configure subuid and subgid mappings:
+Then log out and log back in for the changes to take effect, or run:
 
 ```bash
-sudo usermod --add-subuids 100000-165535 --add-subgids 100000-165535 $USER
+newgrp docker
 ```
 
-Then restart your session for the changes to take effect.
-
 ## Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=hexlet-codebattle/codebattle&type=Date)](https://star-history.com/#hexlet-codebattle/codebattle&Date)

make-compose.mk

@@ -1,82 +1,82 @@
 ASSERTS_PATH = "/tmp/battle_asserts"
 
 compose:
-	podman-compose up app
+	docker compose up app
 
 compose-d:
-	podman-compose up -d app
+	docker compose up -d app
 
 compose-build:
-	podman-compose build --build-arg GIT_HASH=$(shell git rev-parse HEAD) app
+	docker compose build --build-arg GIT_HASH=$(shell git rev-parse HEAD) app
 
 compose-down:
-	podman-compose down -v || true
+	docker compose down -v || true
 
 compose-test-code-checkers:
-	podman-compose run --rm --name codebattle_app app mix test image_executor
+	docker compose run --rm --name codebattle_app app mix test image_executor
 
 compose-test-fe:
-	podman-compose run --rm --name codebattle_app app /bin/sh -c 'cd /app/apps/codebattle && pnpm test'
+	docker compose run --rm --name codebattle_app app /bin/sh -c 'cd /app/apps/codebattle && pnpm test'
 
 compose-test:
-	podman-compose run --rm --name codebattle_app app mix test --exclude image_executor
+	docker compose run --rm --name codebattle_app app mix test --exclude image_executor
 
 compose-kill:
-	podman-compose kill
+	docker compose kill
 
 compose-bash:
-	podman-compose run app bash
+	docker compose run app bash
 
 compose-install-mix:
-	podman-compose run --rm --name codebattle_app app mix deps.get
+	docker compose run --rm --name codebattle_app app mix deps.get
 
 compose-install-pnpm:
-	podman-compose run --rm --name codebattle_app app /bin/sh -c 'cd /app/apps/codebattle && pnpm install && pnpm run build:mem'
+	docker compose run --rm --name codebattle_app app /bin/sh -c 'cd /app/apps/codebattle && pnpm install && pnpm run build:mem'
 
 compose-install: compose-install-mix compose-install-pnpm
 
 compose-setup: compose-down compose-build compose-install compose-db-setup
 
 compose-db-setup:
-	podman-compose run --rm --name codebattle_app app mix ecto.setup
+	docker compose run --rm --name codebattle_app app mix ecto.setup
 
 compose-db-migrate:
-	podman-compose run --rm --name codebattle_app app mix ecto.migrate
+	docker compose run --rm --name codebattle_app app mix ecto.migrate
 
 compose-lint: compose-mix-format compose-mix-credo compose-lint-js-fix
 
 compose-mix-format:
-	podman-compose run --rm --name codebattle_app app mix format
+	docker compose run --rm --name codebattle_app app mix format
 
 compose-mix-credo:
-	podman-compose run app mix credo
+	docker compose run app mix credo
 
 compose-lint-js-fix:
-	podman-compose run --rm --name codebattle_app app /bin/sh -c 'cd /app/apps/codebattle && pnpm run lint --fix'
+	docker compose run --rm --name codebattle_app app /bin/sh -c 'cd /app/apps/codebattle && pnpm run lint --fix'
 
 compose-console:
-	podman-compose run --rm --name codebattle_app app iex -S mix
+	docker compose run --rm --name codebattle_app app iex -S mix
 
 compose-restart:
-	podman-compose restart
+	docker compose restart
 
 compose-stop:
-	podman-compose stop
+	docker compose stop
 
 compose-logs:
-	podman-compose logs -f --tail=100
+	docker compose logs -f --tail=100
 
 compose-compile:
-	podman-compose  run --rm --name codebattle_app app mix compile
+	docker compose  run --rm --name codebattle_app app mix compile
 
 compose-upload-battle-asserts:
-	podman-compose run --rm --name codebattle_app app mix asserts.upload
+	docker compose run --rm --name codebattle_app app mix asserts.upload
 
 compose-build-images:
-	podman-compose run --rm --name codebattle_app app mix images.build ${lang}
+	docker compose run --rm --name codebattle_app app mix images.build ${lang}
 
 compose-pull-images:
-	podman-compose run --rm --name codebattle_app app mix images.pull ${lang}
+	docker compose run --rm --name codebattle_app app mix images.pull ${lang}
 
 compose-push-images:
-	podman-compose run --rm --name codebattle_app app mix images.push ${lang}
+	docker compose run --rm --name codebattle_app app mix images.push ${lang}

services/app/apps/codebattle/assets/css/style.scss

@@ -220,6 +220,44 @@ input[type="range"] {
   border-radius: unset;
 }
 
+.alert-dark-theme {
+  border: none;
+  backdrop-filter: blur(10px);
+  
+  &.alert-info {
+    background: linear-gradient(135deg, rgba(13, 110, 253, 0.9), rgba(13, 110, 253, 0.7));
+    color: #ffffff;
+    border-left: 4px solid #0d6efd;
+  }
+  
+  &.alert-success {
+    background: linear-gradient(135deg, rgba(25, 135, 84, 0.9), rgba(25, 135, 84, 0.7));
+    color: #ffffff;
+    border-left: 4px solid #198754;
+  }
+  
+  &.alert-danger {
+    background: linear-gradient(135deg, rgba(220, 53, 69, 0.9), rgba(220, 53, 69, 0.7));
+    color: #ffffff;
+    border-left: 4px solid #dc3545;
+  }
+  
+  &.alert-warning {
+    background: linear-gradient(135deg, rgba(255, 193, 7, 0.9), rgba(255, 193, 7, 0.7));
+    color: #000000;
+    border-left: 4px solid #ffc107;
+  }
+  
+  .close {
+    text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
+    opacity: 0.8;
+    
+    &:hover {
+      opacity: 1;
+    }
+  }
+}
+
 .gutter-vertical {
   background-image: url("../static/images/verticalGutter.svg");
   cursor: col-resize;

services/app/apps/codebattle/lib/codebattle_web/templates/layout/app.html.heex

@@ -337,15 +337,15 @@
           </div>
         </div>
       <% end %>
-      <div class="bg-light">
+      <div class="bg-dark py-2">
         <div class="container-lg">
           <%= for {type, message} <- @flash || [] do %>
             <div
-              class={"row mb-0 rounded-0 alert alert-#{type} alert-dismissible fade show"}
+              class={"alert alert-#{type} alert-dismissible fade show mb-2 rounded shadow-sm alert-dark-theme"}
               role="alert"
             >
               {message}
-              <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+              <button type="button" class="close text-white" data-dismiss="alert" aria-label="Close">
                 <span aria-hidden="true">&times;</span>
               </button>
             </div>