Skip to content

Commit 3d7e001

Browse files
author
killuazhu
authored
Remove docker-compose dep (#105)
* Remove docker-compose dep * Remove docker-compose
1 parent abc380a commit 3d7e001

File tree

4 files changed

+8
-27
lines changed

4 files changed

+8
-27
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ celerybeat-schedule
8888

8989
# Environments
9090
.env
91+
.envrc
92+
.envrc.*
9193
.env.*
9294
.venv
9395
env/

Makefile

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ SHELL = /bin/bash
33

44
SKAFFOLD_VERBOSITY ?= info
55

6+
TEST_DB_CONTAINER_NAME ?= gd_test_postgres
7+
68
TEST_SECRET_BASE_DIR ?= ./temp
79
TEST_SECRET_COMMENT ?= unit test
810
GD_PUB_KEY_FILENAME := $(TEST_SECRET_BASE_DIR)/test.key.pub
@@ -69,19 +71,14 @@ setup: setup-trivy setup-deploy-tools
6971
PIP_IGNORE_INSTALLED=1 pipenv install --dev --deploy --ignore-pipfile
7072

7173
.PHONY: start-local-test-db
72-
start-local-test-db:
73-
docker-compose up -d db
74-
docker-compose ps
74+
start-local-test-db: stop-local-test-db
75+
docker run -p 54320:5432 -d --name $(TEST_DB_CONTAINER_NAME) -e POSTGRES_HOST_AUTH_METHOD=trust postgres:10
7576
@echo "username/password: postgres/postgres"
7677

7778
.PHONY: stop-local-test-db
7879
stop-local-test-db:
79-
docker-compose stop db
80-
docker-compose rm -f db
81-
82-
.PHONY: conn-local-test-db
83-
conn-local-test-db:
84-
docker-compose run debug
80+
docker ps | grep $(TEST_DB_CONTAINER_NAME) && docker stop $(TEST_DB_CONTAINER_NAME) || true
81+
docker ps -a | grep $(TEST_DB_CONTAINER_NAME) && docker rm -f $(TEST_DB_CONTAINER_NAME) || true
8582

8683
.PHONY: create-unit-test-secrets
8784
create-unit-test-secrets: create-common-test-secrets

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ Under the hood, the server tool uses the developer tool to scan for secrets. Rea
2323
- If you are using macOs, you can use `pyenv` to install Python 3: `brew install pyenv; pyenv install 3.8.5;`
2424
- Optionally, you can set your system's default Python to Python 3 `pyenv global 3.8.5`. Then restart your shell. Run `python --version` to validate the default Python version is 3.
2525
- `docker` https://docs.docker.com/get-docker/
26-
- `docker-compose` installed along with docker
2726
- `skaffold`, v1.12.1 and above
2827
- `kustomize`, v3.8.1 and above. Do **NOT** use the version bundled with `kubectl`, as it does not support some options use by this project (e.g. replicas).
2928
- `container-structure-test`, used for docker image validation - [installation](https://github.com/GoogleContainerTools/container-structure-test#installation).

docker-compose.yaml

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)