Skip to content

Commit

Permalink
Removed docker image.
Browse files Browse the repository at this point in the history
  • Loading branch information
flounderpinto committed Dec 18, 2023
1 parent ffe36dd commit cc37159
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 89 deletions.
12 changes: 0 additions & 12 deletions .github/workflows/workflow-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,3 @@ jobs:

- name: Unit test
run: make unit_test

- name: Docker build branch
run: make docker
if: ${{ github.ref_type == 'branch' && github.ref_name != 'main' }}

- name: Docker build main
run: make docker_main
if: ${{ github.ref_type == 'branch' && github.ref_name == 'main' }}

- name: Docker build tag
run: make docker_tag TAG="${{github.ref_name}}"
if: ${{ github.ref_type == 'tag' }}
21 changes: 2 additions & 19 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@ ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
CONTAINER_CODE_DIR=/opt/code

DOCKER_REGISTRY=index.docker.io/flounderpinto
DOCKER_REPO=builder-docker

INIT_CMD=git submodule update --init --recursive
ANALYZE_CMD=cd ./src && find . -name '*.sh' | xargs shellcheck -x && \
cd ../test/unit && find . -name '*.sh' | xargs shellcheck -x
UNIT_TEST_CMD=cd ./test/unit && ./test.sh
DOCKER_BUILD_BRANCH_CMD=./src/dockerBuild.sh dockerBuildStandardBranch -e ${DOCKER_REGISTRY} -r ${DOCKER_REPO} ${ARGS}
DOCKER_BUILD_MAIN_CMD=./src/dockerBuild.sh dockerBuildStandardMain -e ${DOCKER_REGISTRY} -r ${DOCKER_REPO} ${ARGS}
DOCKER_BUILD_TAG_CMD=./src/dockerBuild.sh dockerBuildStandardTag ${TAG} -e ${DOCKER_REGISTRY} -r ${DOCKER_REPO} ${ARGS}

BUILDER_IMAGE=${DOCKER_REGISTRY}/builder-bash:v0.0.5
BUILDER_PULL_CMD=docker pull ${BUILDER_IMAGE}
Expand All @@ -24,7 +20,7 @@ BUILDER_RUN_CMD=${BUILDER_PULL_CMD} && \
-w ${CONTAINER_CODE_DIR} \
${BUILDER_IMAGE} /bin/bash -c

.PHONY: init analyze analyze_local unit_test unit_test_local docker docker_main docker_tag
.PHONY: init analyze analyze_local unit_test unit_test_local

init:
${INIT_CMD}
Expand All @@ -41,17 +37,4 @@ unit_test:
unit_test_local:
${UNIT_TEST_CMD}

#To prevent the circular dependency, this repo calls the dockerBuild script directly
# instead of through the builder-docker image.
docker:
${DOCKER_BUILD_BRANCH_CMD}

docker_main:
${DOCKER_BUILD_MAIN_CMD}

docker_tag:
test ${TAG}
${DOCKER_BUILD_TAG_CMD}

#Everything right of the pipe is order-only prerequisites.
all: | init analyze unit_test docker
all: | init analyze unit_test
43 changes: 0 additions & 43 deletions docker/Dockerfile

This file was deleted.

15 changes: 0 additions & 15 deletions docker/entrypoint.sh

This file was deleted.

0 comments on commit cc37159

Please sign in to comment.