Skip to content

Commit

Permalink
[#183][migrate] finish
Browse files Browse the repository at this point in the history
  • Loading branch information
Axel Vaganay committed Mar 25, 2024
1 parent d1fb36b commit 1bdfa40
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 498 deletions.
8 changes: 2 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PROFILE ?= prod

.PHONY: all build rebuild stop stop volumes fclean sh-% prune

all: volumes build up migrate
all: volumes build up

build:
docker compose -f docker-compose.yml --profile $(PROFILE) --env-file .env build
Expand Down Expand Up @@ -42,8 +42,4 @@ prune:
-docker rmi $$(docker images -q)
-docker volume rm $$(docker volume ls -q)
-docker network rm $$(docker network ls -q) 2>/dev/null
-docker buildx prune -a -f 2>/dev/null

migrate:
chmod +x migrate.sh
./migrate.sh
-docker buildx prune -a -f 2>/dev/null
45 changes: 2 additions & 43 deletions authentification/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Dockerfile du service profile
# Dockerfile du service auth

FROM python:3.12-bookworm

Expand All @@ -16,45 +16,4 @@ RUN chmod +x /usr/local/bin/script_python.sh
ENTRYPOINT [ "script_python.sh" ]

EXPOSE 8001
# CMD ["tail", "-f", "/dev/null"]

# ##################################################

# FROM python:3.12-bookworm

# # configuration de l'environnement Python qui evite lq creation de fichiers .pyc
# ENV PYTHONDONTWRITEBYTECODE 1
# # desactiver le buffering de la sortie standard
# # assurant que la sortie est immediatement affichee sans delai
# ENV PYTHONUNBUFFERED 1

# WORKDIR /app

# # copie du fichier des dependances dans le conteneur
# COPY requirements.txt /app/

# # Mise a jour pip et install les dependances
# RUN pip install --upgrade pip \
# && pip install --no-cache-dir -r requirements.txt

# # copie du contenu de Django de l'appli dans le conteneur
# COPY . /app/

# # COPY ./script_python.sh /app/
# # RUN chmod 777 ./script_python.sh

# EXPOSE 8001

# # WORKDIR /app/auth

# # # lancer l'appli Django
# # CMD ["python", "manage.py", "runserver", "0.0.0.0:8001"]

# WORKDIR /app/auth

# RUN chmod +x ./script_python.sh
# RUN chmod +x ./wait-for-it.sh

# # CMD ["python", "manage.py", "runserver", "0.0.0.0:8001"]
# CMD ["./script_python.sh"]
# # CMD ["ls", "-l", "script_python.sh"]
# CMD ["tail", "-f", "/dev/null"]
182 changes: 0 additions & 182 deletions authentification/auth/wait-for-it.sh

This file was deleted.

45 changes: 2 additions & 43 deletions friendship/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Dockerfile du service profile
# Dockerfile du service friendship

FROM python:3.12-bookworm

Expand All @@ -16,45 +16,4 @@ RUN chmod +x /usr/local/bin/script_python.sh
ENTRYPOINT [ "script_python.sh" ]

EXPOSE 8003
# CMD ["tail", "-f", "/dev/null"]

# ##################################################

# # Dockerfile du service profile

# FROM python:3.12-bookworm

# # Autres configurations du Dockerfile

# WORKDIR /app

# COPY requirements.txt /app/

# # # Pour fix le probleme backports.zoneinfo
# # RUN pip install --upgrade pip setuptools wheel

# # Mise a jour pip et install les dependances
# RUN pip install --upgrade pip \
# && pip install --no-cache-dir -r requirements.txt

# # Copie des fichiers de l'application
# COPY . /app/
# # COPY ./authentification/auth/ /app/

# # WORKDIR /

# # COPY ./authentification/auth/ /app/auth/

# # Exposer le port sur lequel l'application Django écoute à l'intérieur du conteneur
# EXPOSE 8003

# WORKDIR /app/friendshipApp

# RUN chmod +x ./script_python.sh
# RUN chmod +x ./wait-for-it.sh

# # Commande pour lancer l'application Django
# # CMD ["python3", "manage.py", "runserver", "0.0.0.0:8002"]
# CMD [ "./script_python.sh" ]

# # CMD ["tail", "-f", "/dev/null"]
# CMD ["tail", "-f", "/dev/null"]
Loading

0 comments on commit 1bdfa40

Please sign in to comment.