Fix target docker hub org (#1125)

This commit is contained in:
Chevdor
2022-03-31 18:20:47 +02:00
committed by GitHub
parent 7f3a04f923
commit dcb943fa08
2 changed files with 24 additions and 20 deletions
+12 -10
View File
@@ -72,8 +72,9 @@ jobs:
- name: Build injected image - name: Build injected image
env: env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_ORG: parity
run: | run: |
export OWNER=$DOCKERHUB_USERNAME export OWNER=$DOCKERHUB_ORG
mkdir -p target/release mkdir -p target/release
cp -f $BINARY* target/release/ cp -f $BINARY* target/release/
./docker/scripts/build-injected-image.sh ./docker/scripts/build-injected-image.sh
@@ -87,9 +88,10 @@ jobs:
- name: Tag and Publish - name: Tag and Publish
env: env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_ORG: parity
run: | run: |
docker run --pull never --rm $DOCKERHUB_USERNAME/$BINARY --version docker run --pull never --rm $DOCKERHUB_ORG/$BINARY --version
VERSION=$(docker run --pull never --rm $DOCKERHUB_USERNAME/$BINARY --version | awk '{ print $2 }' ) VERSION=$(docker run --pull never --rm $DOCKERHUB_ORG/$BINARY --version | awk '{ print $2 }' )
SEMVER=$( echo $VERSION | cut -f1 -d- ) SEMVER=$( echo $VERSION | cut -f1 -d- )
GITREF=$( echo $VERSION | cut -f2 -d- ) GITREF=$( echo $VERSION | cut -f2 -d- )
PRE=${{ github.event.inputs.prerelease }} PRE=${{ github.event.inputs.prerelease }}
@@ -107,15 +109,15 @@ jobs:
echo "PRE_STR=$PRE_STR" echo "PRE_STR=$PRE_STR"
echo "TAG=$TAG" echo "TAG=$TAG"
docker tag $DOCKERHUB_USERNAME/$BINARY $DOCKERHUB_USERNAME/$BINARY:$TAG docker tag $DOCKERHUB_ORG/$BINARY $DOCKERHUB_ORG/$BINARY:$TAG
docker push $DOCKERHUB_USERNAME/$BINARY:$TAG docker push $DOCKERHUB_ORG/$BINARY:$TAG
if [[ $PRE != "true" ]]; then if [[ $PRE != "true" ]]; then
docker tag $DOCKERHUB_USERNAME/$BINARY $DOCKERHUB_USERNAME/$BINARY:latest docker tag $DOCKERHUB_ORG/$BINARY $DOCKERHUB_ORG/$BINARY:latest
docker tag $DOCKERHUB_USERNAME/$BINARY $DOCKERHUB_USERNAME/$BINARY:$SEMVER docker tag $DOCKERHUB_ORG/$BINARY $DOCKERHUB_ORG/$BINARY:$SEMVER
docker push $DOCKERHUB_USERNAME/$BINARY:latest docker push $DOCKERHUB_ORG/$BINARY:latest
docker push $DOCKERHUB_USERNAME/$BINARY:$SEMVER docker push $DOCKERHUB_ORG/$BINARY:$SEMVER
fi fi
docker images | grep $DOCKERHUB_USERNAME/$BINARY docker images | grep $DOCKERHUB_ORG/$BINARY
+12 -10
View File
@@ -73,8 +73,9 @@ jobs:
- name: Build injected image - name: Build injected image
env: env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_ORG: parity
run: | run: |
export OWNER=$DOCKERHUB_USERNAME export OWNER=$DOCKERHUB_ORG
mkdir -p target/release mkdir -p target/release
cp -f $BINARY* target/release/ cp -f $BINARY* target/release/
./docker/scripts/build-injected-image.sh ./docker/scripts/build-injected-image.sh
@@ -88,9 +89,10 @@ jobs:
- name: Tag and Publish - name: Tag and Publish
env: env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_ORG: parity
run: | run: |
docker run --pull never --rm $DOCKERHUB_USERNAME/$BINARY --version docker run --pull never --rm $DOCKERHUB_ORG/$BINARY --version
VERSION=$(docker run --pull never --rm $DOCKERHUB_USERNAME/$BINARY --version | awk '{ print $2 }' ) VERSION=$(docker run --pull never --rm $DOCKERHUB_ORG/$BINARY --version | awk '{ print $2 }' )
SEMVER=$( echo $VERSION | cut -f1 -d- ) SEMVER=$( echo $VERSION | cut -f1 -d- )
GITREF=$( echo $VERSION | cut -f2 -d- ) GITREF=$( echo $VERSION | cut -f2 -d- )
PRE=${{ github.event.release.prerelease }} PRE=${{ github.event.release.prerelease }}
@@ -108,15 +110,15 @@ jobs:
echo "PRE_STR=$PRE_STR" echo "PRE_STR=$PRE_STR"
echo "TAG=$TAG" echo "TAG=$TAG"
docker tag $DOCKERHUB_USERNAME/$BINARY $DOCKERHUB_USERNAME/$BINARY:$TAG docker tag $DOCKERHUB_ORG/$BINARY $DOCKERHUB_ORG/$BINARY:$TAG
docker push $DOCKERHUB_USERNAME/$BINARY:$TAG docker push $DOCKERHUB_ORG/$BINARY:$TAG
if [[ $PRE != "true" ]]; then if [[ $PRE != "true" ]]; then
docker tag $DOCKERHUB_USERNAME/$BINARY $DOCKERHUB_USERNAME/$BINARY:latest docker tag $DOCKERHUB_ORG/$BINARY $DOCKERHUB_ORG/$BINARY:latest
docker tag $DOCKERHUB_USERNAME/$BINARY $DOCKERHUB_USERNAME/$BINARY:$SEMVER docker tag $DOCKERHUB_ORG/$BINARY $DOCKERHUB_ORG/$BINARY:$SEMVER
docker push $DOCKERHUB_USERNAME/$BINARY:latest docker push $DOCKERHUB_ORG/$BINARY:latest
docker push $DOCKERHUB_USERNAME/$BINARY:$SEMVER docker push $DOCKERHUB_ORG/$BINARY:$SEMVER
fi fi
docker images | grep $DOCKERHUB_USERNAME/$BINARY docker images | grep $DOCKERHUB_ORG/$BINARY