diff --git a/.drone.yml b/.drone.yml index cc27ec7..b79a12e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,10 +17,11 @@ steps: - docker run --rm --privileged docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64 - docker buildx create --use --name crosscomp - docker buildx inspect --bootstrap + - docker login --username $DOCKER_USERNAME --password DOCKER_PASSWORD registry.chrz.de:443 - docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --output=type=image,push=true --progress tty --build-arg PROP_SERVER --build-arg PROP_SERVER_USER --build-arg PROP_SERVER_KEY --build-arg PROP_DIR_SDR --build-arg PROP_DIR_DECODER - -t registry.chrz.de:443/move2docker:multi . + -t registry.chrz.de:443/redsat/move2docker . environment: PROP_SERVER_USER: from_secret: prop_server_user @@ -32,6 +33,10 @@ steps: from_secret: prop_dir_sdr PROP_DIR_DECODER: from_secret: prop_dir_decoder + DOCKER_USERNAME: + from_secret: docker_username + DOCKER_PASSWORD: + from_secret: docker_password - name: notify image: drillster/drone-email diff --git a/scripts/build.sh b/scripts/build.sh index 89414c1..dd636ef 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -7,4 +7,4 @@ export PROP_SERVER_KEY=$(cat ./config/id_rsa) docker build \ --build-arg PROP_SERVER --build-arg PROP_SERVER_USER \ --build-arg PROP_SERVER_KEY --build-arg PROP_DIR_SDR --build-arg PROP_DIR_DECODER \ - -t registry.chrz.de:443/move2docker:$(arch) . \ No newline at end of file + -t registry.chrz.de:443/redsat/move2docker:$(arch) . \ No newline at end of file diff --git a/scripts/buildx.sh b/scripts/buildx.sh index f24fc6e..fda76ab 100644 --- a/scripts/buildx.sh +++ b/scripts/buildx.sh @@ -8,4 +8,4 @@ docker buildx build \ --platform linux/amd64,linux/arm64,linux/arm/v7 \ --build-arg PROP_SERVER --build-arg PROP_SERVER_USER \ --build-arg PROP_SERVER_KEY --build-arg PROP_DIR_SDR --build-arg PROP_DIR_DECODER \ - -t registry.chrz.de:443/move2docker:multi . \ No newline at end of file + -t registry.chrz.de:443/redsat/move2docker . \ No newline at end of file diff --git a/scripts/pull.sh b/scripts/pull.sh index 79ccfbe..cafc940 100644 --- a/scripts/pull.sh +++ b/scripts/pull.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker pull registry.chrz.de:443/move2docker:$(arch) \ No newline at end of file +docker pull registry.chrz.de:443/redsat/move2docker:$(arch) \ No newline at end of file diff --git a/scripts/push.sh b/scripts/push.sh index a2b7291..7b185e9 100644 --- a/scripts/push.sh +++ b/scripts/push.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker push registry.chrz.de:443/move2docker-$(arch) \ No newline at end of file +docker push registry.chrz.de:443/redsat/move2docker-$(arch) \ No newline at end of file diff --git a/scripts/run.sh b/scripts/run.sh index 5197ab8..eb63e26 100644 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -6,4 +6,4 @@ source ./config/config.sh docker run -it --rm \ -v $(pwd)/data:/app/data:rw \ --env DISPLAY=host.docker.internal:0.0 \ - registry.chrz.de:443/move2docker:$(arch) \ No newline at end of file + registry.chrz.de:443/redsat/move2docker:$(arch) \ No newline at end of file