changing docker repo

This commit is contained in:
buanet
2019-10-22 14:30:08 +02:00
parent e1268aa27c
commit c67fe82e6f
2 changed files with 21 additions and 21 deletions

View File

@@ -30,7 +30,7 @@ jobs:
- JOB_NAME="Build images" - JOB_NAME="Build images"
script: script:
- sed -i "s/\$VERSION/${VERSION}/g" $ARCH/scripts/iobroker_startup.sh - sed -i "s/\$VERSION/${VERSION}/g" $ARCH/scripts/iobroker_startup.sh
- docker build -t "buanet/iobroker-testing:$VERSION-$ARCH" ./amd64 - docker build -t "buanet/iobroker:$VERSION-$ARCH" ./amd64
- stage: Build images - stage: Build images
env: env:
@@ -39,7 +39,7 @@ jobs:
script: script:
- docker run --rm --privileged multiarch/qemu-user-static:register --reset - docker run --rm --privileged multiarch/qemu-user-static:register --reset
- sed -i "s/\$VERSION/${VERSION}/g" $ARCH/scripts/iobroker_startup.sh - sed -i "s/\$VERSION/${VERSION}/g" $ARCH/scripts/iobroker_startup.sh
- docker build -t "buanet/iobroker-testing:$VERSION-$ARCH" ./aarch64 - docker build -t "buanet/iobroker:$VERSION-$ARCH" ./aarch64
- stage: Build images - stage: Build images
env: env:
@@ -48,7 +48,7 @@ jobs:
script: script:
- docker run --rm --privileged multiarch/qemu-user-static:register --reset - docker run --rm --privileged multiarch/qemu-user-static:register --reset
- sed -i "s/\$VERSION/${VERSION}/g" $ARCH/scripts/iobroker_startup.sh - sed -i "s/\$VERSION/${VERSION}/g" $ARCH/scripts/iobroker_startup.sh
- docker build -t "buanet/iobroker-testing:$VERSION-$ARCH" ./armv7hf - docker build -t "buanet/iobroker:$VERSION-$ARCH" ./armv7hf
- stage: Manifest - stage: Manifest
env: env:
@@ -60,11 +60,11 @@ after_success:
# tag and push built images # tag and push built images
- > - >
if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Build images" ] ; then if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Build images" ] ; then
docker push buanet/iobroker-testing:$VERSION-$ARCH docker push buanet/iobroker:$VERSION-$ARCH
fi fi
if [ "$TRAVIS_BRANCH" == "beta" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Build images" ] ; then if [ "$TRAVIS_BRANCH" == "beta" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Build images" ] ; then
docker push buanet/iobroker-testing:$VERSION-$ARCH docker push buanet/iobroker:$VERSION-$ARCH
fi fi
# update repository manifest for multiarch and push to hub # update repository manifest for multiarch and push to hub
@@ -72,34 +72,34 @@ after_success:
if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Manifest" ]; then if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Manifest" ]; then
cat manifest.yml | sed "s/\$VERSION/${VERSION}/g" > manifest.yaml cat manifest.yml | sed "s/\$VERSION/${VERSION}/g" > manifest.yaml
#manifest for image: buanet/iobroker-testing:version #manifest for image: buanet/iobroker:version
cat manifest.yaml | sed "s/\$DOCKERTAG/${VERSION}/g" > manifestversion.yaml cat manifest.yaml | sed "s/\$DOCKERTAG/${VERSION}/g" > manifestversion.yaml
#manifest for image: buanet/iobroker-testing:latest #manifest for image: buanet/iobroker:latest
cat manifest.yaml | sed "s/\$DOCKERTAG/latest/g" > manifestlatest.yaml cat manifest.yaml | sed "s/\$DOCKERTAG/latest/g" > manifestlatest.yaml
#push to hub #push to hub
mv manifestversion.yaml iobroker-testing.yaml mv manifestversion.yaml iobroker.yaml
./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker-testing.yaml ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml
mv manifestlatest.yaml iobroker-testing.yaml mv manifestlatest.yaml iobroker.yaml
./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker-testing.yaml ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml
fi fi
if [ "$TRAVIS_BRANCH" == "beta" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Manifest" ]; then if [ "$TRAVIS_BRANCH" == "beta" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Manifest" ]; then
cat manifest.yml | sed "s/\$VERSION/${VERSION}/g" > manifest.yaml cat manifest.yml | sed "s/\$VERSION/${VERSION}/g" > manifest.yaml
#manifest for image: buanet/iobroker-testing:version #manifest for image: buanet/iobroker:version
cat manifest.yaml | sed "s/\$DOCKERTAG/${VERSION}/g" > manifestversion.yaml cat manifest.yaml | sed "s/\$DOCKERTAG/${VERSION}/g" > manifestversion.yaml
#manifest for image: buanet/iobroker-testing:beta #manifest for image: buanet/iobroker:beta
cat manifest.yaml | sed "s/\$DOCKERTAG/beta/g" > manifestbeta.yaml cat manifest.yaml | sed "s/\$DOCKERTAG/beta/g" > manifestbeta.yaml
#push to hub #push to hub
mv manifestversion.yaml iobroker-testing.yaml mv manifestversion.yaml iobroker.yaml
./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker-testing.yaml ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml
mv manifestbeta.yaml iobroker-testing.yaml mv manifestbeta.yaml iobroker.yaml
./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker-testing.yaml ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml
fi fi

View File

@@ -1,18 +1,18 @@
image: buanet/iobroker-testing:$DOCKERTAG image: buanet/iobroker:$DOCKERTAG
manifests: manifests:
- -
image: buanet/iobroker-testing:$VERSION-amd64 image: buanet/iobroker:$VERSION-amd64
platform: platform:
architecture: amd64 architecture: amd64
os: linux os: linux
- -
image: buanet/iobroker-testing:$VERSION-aarch64 image: buanet/iobroker:$VERSION-aarch64
platform: platform:
architecture: arm64 architecture: arm64
variant: v8 variant: v8
os: linux os: linux
- -
image: buanet/iobroker-testing:$VERSION-armv7hf image: buanet/iobroker:$VERSION-armv7hf
platform: platform:
architecture: arm architecture: arm
variant: v7 variant: v7