diff --git a/drone/.drone.yml b/drone/.drone.yml index 2c4f295..6cf7c5e 100644 --- a/drone/.drone.yml +++ b/drone/.drone.yml @@ -3,14 +3,14 @@ type: docker name: "Server CI" -steps: - - name: Unit tests - image: override6/tbasket-backend:latest - volumes: - - name: build - path: ./build - commands: - - ./mill tests.test +#steps: +# - name: Unit tests +# image: override6/tbasket-backend:latest +# volumes: +# - name: build +# path: ./build +# commands: +# - ./mill tests.test # - name: Deploy # image: override6/tbasket-backend:latest @@ -38,6 +38,11 @@ name: "Deploy committed docker images" steps: - name: Build and push image: override6/docker-git + environment: + DOCKER_USERNAME: + from_secret: DOCKER_USERNAME + DOCKER_PASSWORD: + from_secret: DOCKER_PASSWORD commands: - chmod +x drone/image-deploy.sh - drone/image-deploy.sh diff --git a/drone/image/tbasket-backend.dockerfile b/drone/image/tbasket-backend.dockerfile index c0f467f..ff64626 100644 --- a/drone/image/tbasket-backend.dockerfile +++ b/drone/image/tbasket-backend.dockerfile @@ -7,3 +7,4 @@ RUN apt update &&\ mkdir /opt/gradle &&\ unzip -d /opt/gradle gradle-7.5.1-bin.zip &&\ export GRADLE_HOME=/opt/gradle/gradle-7.5.1 + diff --git a/drone/image/tbasket-test.dockerfile b/drone/image/tbasket-test.dockerfile index 4c4d34a..d9676dc 100644 --- a/drone/image/tbasket-test.dockerfile +++ b/drone/image/tbasket-test.dockerfile @@ -7,3 +7,4 @@ RUN apt update &&\ mkdir /opt/gradle &&\ unzip -d /opt/gradle gradle-7.5.1-bin.zip &&\ export GRADLE_HOME=/opt/gradle/gradle-7.5.1 \ +