Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip build #1080

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added CuteKitty
Empty file.
180 changes: 90 additions & 90 deletions hooks/build
Original file line number Diff line number Diff line change
Expand Up @@ -42,93 +42,93 @@ docker build \
--tag ddmal/docker-webhook:placeholder \
.

###############################################################################
# Stage 1
# Build and push Python3-Celery image

# Too many times did docker cache mess up a build. No more cache.
echo "[+] Building Python3-Celery"

docker build \
--no-cache \
--build-arg BRANCHES="develop" \
--build-arg VERSION=${DOCKER_TAG} \
--tag ddmal/rodan-python3-celery:${DOCKER_TAG} \
--file ./python3-celery/Dockerfile \
.

echo "[+] Pushing ddmal/rodan-python3-celery:${DOCKER_TAG}"
docker push ddmal/rodan-python3-celery:${DOCKER_TAG}

###############################################################################
# Stage 2
# Build and push Rodan and Rodan-Client

echo "[+] Building Rodan & Celery Core"

BUILD_HASH=`git rev-parse --verify HEAD`
# Don't remove --no-cache
docker build \
--no-cache \
--build-arg BRANCHES="develop" \
--build-arg VERSION=${DOCKER_TAG} \
--build-arg build_hash=${BUILD_HASH} \
--tag ddmal/rodan-main:${DOCKER_TAG} \
--file ./rodan-main/Dockerfile \
.

echo "[+] Building Rodan-Client"

docker build \
--no-cache \
--build-arg BRANCHES="develop" \
--build-arg VERSION=${DOCKER_TAG} \
--tag ddmal/rodan-client:${DOCKER_TAG} \
./rodan-client

echo "[+] Pushing ddmal/rodan-main:${DOCKER_TAG}"
docker push ddmal/rodan-main:${DOCKER_TAG}

echo "[+] Pushing ddmal/rodan-client:${DOCKER_TAG}"
docker push ddmal/rodan-client:${DOCKER_TAG}

##############################################################################
# Stage 3
# Build the rest

echo "[+] Building GPU-Celery"

docker build \
--no-cache \
--build-arg BRANCHES="develop" \
--build-arg VERSION=${DOCKER_TAG} \
--tag ddmal/rodan-gpu-celery:${DOCKER_TAG} \
--file ./gpu-celery/Dockerfile \
.

echo "[+] Building Postgres"

docker build \
--no-cache \
--build-arg VERSION=${DOCKER_TAG} \
--tag ddmal/postgres-plpython:${DOCKER_TAG} \
--file ./postgres/Dockerfile \
.

echo "[+] Building Nginx"

docker build \
--no-cache \
--build-arg VERSION=${DOCKER_TAG} \
--tag ddmal/nginx:${DOCKER_TAG} \
./nginx

echo "[+] Building iipsrv"

docker build \
--no-cache \
--build-arg VERSION=${DOCKER_TAG} \
--tag ddmal/iipsrv:${DOCKER_TAG} \
./iipsrv

echo "[+] Finished"
# ###############################################################################
# # Stage 1
# # Build and push Python3-Celery image
#
# # Too many times did docker cache mess up a build. No more cache.
# echo "[+] Building Python3-Celery"
#
# docker build \
# --no-cache \
# --build-arg BRANCHES="develop" \
# --build-arg VERSION=${DOCKER_TAG} \
# --tag ddmal/rodan-python3-celery:${DOCKER_TAG} \
# --file ./python3-celery/Dockerfile \
# .
#
# echo "[+] Pushing ddmal/rodan-python3-celery:${DOCKER_TAG}"
# docker push ddmal/rodan-python3-celery:${DOCKER_TAG}
#
# ###############################################################################
# # Stage 2
# # Build and push Rodan and Rodan-Client
#
# echo "[+] Building Rodan & Celery Core"
#
# BUILD_HASH=`git rev-parse --verify HEAD`
# # Don't remove --no-cache
# docker build \
# --no-cache \
# --build-arg BRANCHES="develop" \
# --build-arg VERSION=${DOCKER_TAG} \
# --build-arg build_hash=${BUILD_HASH} \
# --tag ddmal/rodan-main:${DOCKER_TAG} \
# --file ./rodan-main/Dockerfile \
# .
#
# echo "[+] Building Rodan-Client"
#
# docker build \
# --no-cache \
# --build-arg BRANCHES="develop" \
# --build-arg VERSION=${DOCKER_TAG} \
# --tag ddmal/rodan-client:${DOCKER_TAG} \
# ./rodan-client
#
# echo "[+] Pushing ddmal/rodan-main:${DOCKER_TAG}"
# docker push ddmal/rodan-main:${DOCKER_TAG}
#
# echo "[+] Pushing ddmal/rodan-client:${DOCKER_TAG}"
# docker push ddmal/rodan-client:${DOCKER_TAG}
#
# ##############################################################################
# # Stage 3
# # Build the rest
#
# echo "[+] Building GPU-Celery"
#
# docker build \
# --no-cache \
# --build-arg BRANCHES="develop" \
# --build-arg VERSION=${DOCKER_TAG} \
# --tag ddmal/rodan-gpu-celery:${DOCKER_TAG} \
# --file ./gpu-celery/Dockerfile \
# .
#
# echo "[+] Building Postgres"
#
# docker build \
# --no-cache \
# --build-arg VERSION=${DOCKER_TAG} \
# --tag ddmal/postgres-plpython:${DOCKER_TAG} \
# --file ./postgres/Dockerfile \
# .
#
# echo "[+] Building Nginx"
#
# docker build \
# --no-cache \
# --build-arg VERSION=${DOCKER_TAG} \
# --tag ddmal/nginx:${DOCKER_TAG} \
# ./nginx
#
# echo "[+] Building iipsrv"
#
# docker build \
# --no-cache \
# --build-arg VERSION=${DOCKER_TAG} \
# --tag ddmal/iipsrv:${DOCKER_TAG} \
# ./iipsrv
#
# echo "[+] Finished"
30 changes: 15 additions & 15 deletions hooks/push
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ fi
echo "[+] Building images with tag: $DOCKER_TAG"
echo "Docker tag: $DOCKER_TAG"

# RODAN_TAG=`cd rodan-main/code && git describe --tags --always`
# RODAN_CLIENT_TAG=`cd rodan-client/code && git describe --tags --always`
# RODAN_DOCKER_TAG=`git describe --tags --always`

echo "[+] Pushing ddmal/rodan-gpu-celery:${DOCKER_TAG}"
docker push ddmal/rodan-gpu-celery:${DOCKER_TAG}

echo "[+] Pushing ddmal/postgres-plpython:${DOCKER_TAG}"
docker push ddmal/postgres-plpython:${DOCKER_TAG}

echo "[+] Pushing ddmal/nginx:${DOCKER_TAG}"
docker push ddmal/nginx:${DOCKER_TAG}

echo "[+] Pushing ddmal/iipsrv:${DOCKER_TAG}"
docker push ddmal/iipsrv:${DOCKER_TAG}
# # RODAN_TAG=`cd rodan-main/code && git describe --tags --always`
# # RODAN_CLIENT_TAG=`cd rodan-client/code && git describe --tags --always`
# # RODAN_DOCKER_TAG=`git describe --tags --always`
#
# echo "[+] Pushing ddmal/rodan-gpu-celery:${DOCKER_TAG}"
# docker push ddmal/rodan-gpu-celery:${DOCKER_TAG}
#
# echo "[+] Pushing ddmal/postgres-plpython:${DOCKER_TAG}"
# docker push ddmal/postgres-plpython:${DOCKER_TAG}
#
# echo "[+] Pushing ddmal/nginx:${DOCKER_TAG}"
# docker push ddmal/nginx:${DOCKER_TAG}
#
# echo "[+] Pushing ddmal/iipsrv:${DOCKER_TAG}"
# docker push ddmal/iipsrv:${DOCKER_TAG}

# Pass building images
# Push to trigger webhook and send a message to slack
Expand Down