diff --git a/.woodpecker.yml b/.woodpecker.yml index 4bd827a..bdc750e 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -11,9 +11,9 @@ steps: - name: dockersock path: /var/run/docker.sock environment: - IMAGE: "flask-demo:latest" + IMAGE: flask-demo:latest commands: - - docker build -t "${IMAGE}" . + - docker build -t $IMAGE . deploy: image: docker:27-cli @@ -28,6 +28,8 @@ steps: branch: - main +# объявление хостового тома для монтирования docker.sock volumes: - name: dockersock - host: /var/run/docker.sock # <— строка, не объект! + host: + path: /var/run/docker.sock \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index bdc750e..036728a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,35 +1,8 @@ -steps: - test: - image: python:3.11 - commands: - - pip install -r requirements.txt - - pytest -q - - build: - image: docker:27-cli - volumes: - - name: dockersock - path: /var/run/docker.sock - environment: - IMAGE: flask-demo:latest - commands: - - docker build -t $IMAGE . - - deploy: - image: docker:27-cli - volumes: - - name: dockersock - path: /var/run/docker.sock - commands: - - docker compose up -d - when: - event: - - push - branch: - - main - -# объявление хостового тома для монтирования docker.sock -volumes: - - name: dockersock - host: - path: /var/run/docker.sock \ No newline at end of file +version: "3.8" +services: + web: + image: flask-demo:latest + container_name: flask-demo + ports: + - "8888:8888" + restart: unless-stopped