Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
coutoPL committed Aug 5, 2024
1 parent 03e56ff commit 4e43e1a
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 163 deletions.
4 changes: 0 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ services:
dockerfile: Dockerfile
# todo added temporary
ports:
- 5432:5432
- 18080:8080
deploy:
resources:
Expand Down Expand Up @@ -72,9 +71,6 @@ services:
FLINK_REST_URL: "http://flink-jobmanager:8081"
JDK_JAVA_OPTIONS: "-Xmx1024M"
USAGE_REPORTS_SOURCE: "quickstart-docker-compose"
JAVA_TOOL_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 #todo: remove + port
ports:
- 5005:5005
depends_on:
postgres:
condition: service_healthy
Expand Down
14 changes: 2 additions & 12 deletions mocks/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@ CMD ["/sbin/my_init"]
# install
USER root

RUN apt-get install -y --no-install-recommends curl ca-certificates && \
install -d /usr/share/postgresql-common/pgdg && \
curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc && \
echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
apt-get update -y && \
apt -y install postgresql-16 openjdk-11-jre-headless && \
RUN apt-get update -y && \
apt -y install openjdk-11-jre-headless && \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

# WIREMOCK
Expand All @@ -30,11 +26,5 @@ RUN mv /etc/service/http-service/run-wiremock.sh /etc/service/http-service/run

EXPOSE 8080

# POSTGRES
COPY postgres/scripts /etc/service/postgresql
RUN mv /etc/service/postgresql/run_postgres.sh /etc/service/postgresql/run

EXPOSE 5432

HEALTHCHECK --interval=30s --timeout=10s --start-period=30s --retries=30 \
CMD (curl -f http://localhost:8080/__admin/ && pg_isready -U postgres) || exit 1
3 changes: 2 additions & 1 deletion mocks/Readme.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# MOCKS:
# MOCKS

## Resources:
https://github.com/wiremock/wiremock-faker-extension/blob/main/docs/reference.md
https://docs.wiremock.io/response-templating/basics/
https://docs.wiremock.io/response-templating/dates-and-times/
97 changes: 0 additions & 97 deletions mocks/postgres/scripts/postgres_operations.sh

This file was deleted.

31 changes: 0 additions & 31 deletions mocks/postgres/scripts/postgres_setup.sh

This file was deleted.

18 changes: 0 additions & 18 deletions mocks/postgres/scripts/run_postgres.sh

This file was deleted.

0 comments on commit 4e43e1a

Please sign in to comment.