Compare commits
	
		
			6 Commits
		
	
	
		
			02f69f2e68
			...
			263bea92f4
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 263bea92f4 | |||
| 2e9641bf27 | |||
| 43e58a3717 | |||
| c3593d2109 | |||
| c04f3fa5f8 | |||
| 59c94e6c51 | 
| @@ -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 | ||||||
|   | |||||||
| @@ -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 | ||||||
| @@ -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"] | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| #! /bin/bash | #!/bin/bash | ||||||
| pytest --disable-warnings | pytest --disable-warnings | ||||||
| python ./scripts/create_database.py | python ./scripts/create_database.py | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user