chore: standardize on a single naming scheme for releases

- "build" Dockerfiles should start with build-
- "release" scripts should have the name of the thing they are building appended
This commit is contained in:
Jose Diaz-Gonzalez
2019-01-21 21:40:10 -05:00
parent 8d577b275e
commit 0798841f83
9 changed files with 6 additions and 6 deletions

View File

@@ -8,7 +8,7 @@ jobs:
- run: | - run: |
make ci-dependencies make ci-dependencies
- run: | - run: |
./contrib/release build ./contrib/release-dokku build
./tests/ci/setup.sh ./tests/ci/setup.sh
- run: | - run: |
echo 'export DOKKU_SKIP_CLEANUP=true' | sudo tee /home/dokku/.dokkurc/dokku_skip_cleanup echo 'export DOKKU_SKIP_CLEANUP=true' | sudo tee /home/dokku/.dokkurc/dokku_skip_cleanup

View File

@@ -49,7 +49,7 @@ fn-build-dokku() {
--build-arg IS_RELEASE="$IS_RELEASE" \ --build-arg IS_RELEASE="$IS_RELEASE" \
--build-arg PLUGIN_MAKE_TARGET="build" \ --build-arg PLUGIN_MAKE_TARGET="build" \
--build-arg GOLANG_VERSION="$GOLANG_VERSION" \ --build-arg GOLANG_VERSION="$GOLANG_VERSION" \
-f "contrib/build.Dockerfile" \ -f "contrib/build-dokku.Dockerfile" \
-t "$NAME" . -t "$NAME" .
return "$?" return "$?"
} }

View File

@@ -32,7 +32,7 @@ fn-build-dokku() {
pushd "$ROOT_DIR" >/dev/null pushd "$ROOT_DIR" >/dev/null
docker build \ docker build \
-f "contrib/update-build.Dockerfile" \ -f "contrib/build-dokku-update.Dockerfile" \
-t dokku-update:build . -t dokku-update:build .
return "$?" return "$?"
} }

View File

@@ -32,7 +32,7 @@ fn-build-dokku() {
pushd "$ROOT_DIR" >/dev/null pushd "$ROOT_DIR" >/dev/null
docker build \ docker build \
-f "contrib/herokuish-build.Dockerfile" \ -f "contrib/build-herokuish.Dockerfile" \
-t herokuish:build . -t herokuish:build .
return "$?" return "$?"
} }

View File

@@ -7,7 +7,7 @@ To propose a release, the following tasks need to be performed:
```shell ```shell
export PACKAGECLOUD_TOKEN=SOME_TOKEN export PACKAGECLOUD_TOKEN=SOME_TOKEN
# supports major/minor/patch/betafish # supports major/minor/patch/betafish
contrib/release contrib/release-dokku
``` ```
> If you are a maintainer and need the PACKAGECLOUD_TOKEN in order to make a release, please contact @josegonzalez to get this information. > If you are a maintainer and need the PACKAGECLOUD_TOKEN in order to make a release, please contact @josegonzalez to get this information.

View File

@@ -43,7 +43,7 @@ install_dokku() {
return return
fi fi
"${ROOT_DIR}/contrib/release" build "${ROOT_DIR}/contrib/release-dokku" build
echo "dokku dokku/hostname string dokku.me" | sudo debconf-set-selections echo "dokku dokku/hostname string dokku.me" | sudo debconf-set-selections
echo "dokku dokku/key_file string /root/.ssh/id_rsa.pub" | sudo debconf-set-selections echo "dokku dokku/key_file string /root/.ssh/id_rsa.pub" | sudo debconf-set-selections