Skip to content

Commit

Permalink
Merge pull request #15 from suchencjusz/dev
Browse files Browse the repository at this point in the history
ci fix bruh
  • Loading branch information
suchencjusz authored Dec 12, 2023
2 parents 8690099 + 0036591 commit 60d9140
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion FILMAN-CRAWLER/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ WORKDIR /FILMAN-CRAWLER
COPY requirements.txt requirements.txt
RUN pip3 install -r requirements.txt

COPY . .
COPY /FILMAN-CRAWLER .

CMD [ "python3", "main.py"]
2 changes: 1 addition & 1 deletion FILMAN-DISCORD/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ WORKDIR /FILMAN-DISCORD
COPY requirements.txt requirements.txt
RUN pip3 install -r requirements.txt

COPY . .
COPY /FILMAN-DISCORD .

CMD [ "python3", "-OO", "main.py"]
2 changes: 1 addition & 1 deletion FILMAN-SERVER/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ WORKDIR /FILMAN-SERVER
COPY requirements.txt requirements.txt
RUN pip3 install -r requirements.txt

COPY . .
COPY /FILMAN-SERVER .

CMD [ "python3", "main.py"]
16 changes: 9 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ services:
ports:
- "8000:8000"
build:
context: /FILMAN-SERVER
dockerfile: Dockerfile
# context: /FILMAN-SERVER
context: .
dockerfile: FILMAN-SERVER/Dockerfile
environment:
- MYSQL_HOST=mysql.mikr.us
- MYSQL_USER=t345
Expand All @@ -22,8 +23,9 @@ services:
- filman-server
container_name: filman-discord
build:
context: /FILMAN-DISCORD
dockerfile: Dockerfile
# context: /FILMAN-DISCORD
context: .
dockerfile: FILMAN-DISCORD/Dockerfile
environment:
- DISCORD_TOKEN=MTE4MjM3MTY1ODM0NzA2NTM5NA.Gr7OHu.Y3PW4Dl98nLZAzAw1eJfvAzpushE3GXyM0qAX8
restart: unless-stopped
Expand All @@ -33,9 +35,9 @@ services:
- filman-server
container_name: filman-crawler
build:
context: /FILMAN-CRAWLER
# context: .
dockerfile: Dockerfile
# context: /FILMAN-CRAWLER
context: .
dockerfile: FILMAN-CRAWLER/Dockerfile
environment:
- CORE_ENDPOINT=http://filman-server:8000
restart: unless-stopped

0 comments on commit 60d9140

Please sign in to comment.