Warwick/WMGZON
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Warwick:02f69f2e685045f771c7e30b964ec030d0ed6ec4
Branches Tags
Warwick:master Warwick:feature/advancedFiltering Warwick:e2eTesting Warwick:CICD
...
compare: Warwick:263bea92f42126ac4031f1b57711b93c46bf7b3c
Branches Tags
Warwick:feature/advancedFiltering Warwick:master Warwick:e2eTesting Warwick:CICD

6 Commits
02f69f2e68 ... 263bea92f4

Author SHA1 Message Date
Luke Else
263bea92f4 CHORE: Exposed correct port in docker file 2024-02-18 21:05:19 +00:00
Luke Else
2e9641bf27 CHORE: Changed pipeline docker build container 2024-02-18 20:50:50 +00:00
Luke Else
43e58a3717 CHORE: Update CICD to build containers for amd not arm 2024-02-18 20:31:58 +00:00
Luke Else
c3593d2109 CHORE: Update CICD to build containers for amd not arm 2024-02-18 20:28:43 +00:00
Luke Else
c04f3fa5f8 CHORE: Update run.bash to have the correct shebang 2024-02-18 20:13:25 +00:00
Luke Else
59c94e6c51 CHORE: Updated dockerfile to include entrypoint 2024-02-18 20:06:12 +00:00
4 changed files with 7 additions and 5 deletions
Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@@ -16,13 +16,13 @@ deploy:
stage: deploy stage: deploy
tags: tags:
- docker - docker
image: docker:20.10.16 image: docker:latest
services: services:
- name: docker:20.10.16-dind - name: docker:dind
alias: docker alias: docker
script: script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA . - docker buildx build --platform linux/amd64 -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA .
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
- docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA $CI_REGISTRY_IMAGE:latest - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA $CI_REGISTRY_IMAGE:latest
- docker push $CI_REGISTRY_IMAGE:latest - docker push $CI_REGISTRY_IMAGE:latest

1
cicd/Deployment/docker-compose.yml
View File

@@ -9,4 +9,5 @@ services:
- "8080:8080" - "8080:8080"
volumes: volumes:
- ./files:/app/static/assets/img/products/ - ./files:/app/static/assets/img/products/
- ./data:/app/data/
restart: unless-stopped restart: unless-stopped

3
dockerfile
View File

@@ -4,4 +4,5 @@ WORKDIR /app
RUN pip install -r requirements.txt RUN pip install -r requirements.txt
COPY . /app COPY . /app
RUN chmod +x scripts/run.bash RUN chmod +x scripts/run.bash
CMD ["bash", "scripts/run.bash"] EXPOSE 8080
ENTRYPOINT ["scripts/run.bash"]