public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

more to revert

This commit is contained in:
Felix Kunde 2021-01-07 09:19:38 +01:00
parent 64f54d7c00
commit 93f9ca6aff
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/DebugDockerfile
View File

@ -16,4 +16,4 @@ RUN chown -R pgo:pgo /dlv
USER pgo:pgo USER pgo:pgo
RUN ls -l / RUN ls -l /
CMD ["/dlv", "--listen=:7777", "--headless=true", "--api-version=2", "exec", "/postgres-operator"] CMD ["/dlv", "--listen=:7777", "--headless=true", "--api-version=2", "exec", "/postgres-operator"]

2
docker/Dockerfile
View File

@ -12,4 +12,4 @@ RUN adduser -D -u 1000 -G pgo -g 'Postgres Operator' pgo
USER 1000:1000 USER 1000:1000
ENTRYPOINT ["/postgres-operator"] ENTRYPOINT ["/postgres-operator"]

4
docs/developer.md
View File

@ -175,7 +175,7 @@ go get -u github.com/derekparker/delve/cmd/dlv
* Add following dependencies to the `Dockerfile` * Add following dependencies to the `Dockerfile`
``` ```
RUN apt-get update && apt-get install -y go git musl-dev RUN apk --no-cache add go git musl-dev
RUN go get github.com/derekparker/delve/cmd/dlv RUN go get github.com/derekparker/delve/cmd/dlv
``` ```
@ -239,7 +239,7 @@ kubectl logs acid-minimal-cluster-0
The operator provides reference end-to-end (e2e) tests to The operator provides reference end-to-end (e2e) tests to
ensure various infrastructure parts work smoothly together. The test code is available at `e2e/tests`. ensure various infrastructure parts work smoothly together. The test code is available at `e2e/tests`.
The special `registry.opensource.zalan.do/acid/postgres-operator-e2e-tests-runner` image is used to run the tests. The container mounts the local `e2e/tests` directory at runtime, so whatever you modify in your local copy of the tests will be executed by a test runner. By maintaining a separate test runner image we avoid the need to re-build the e2e test image on every build. The special `registry.opensource.zalan.do/acid/postgres-operator-e2e-tests-runner` image is used to run the tests. The container mounts the local `e2e/tests` directory at runtime, so whatever you modify in your local copy of the tests will be executed by a test runner. By maintaining a separate test runner image we avoid the need to re-build the e2e test image on every build.
Each e2e execution tests a Postgres Operator image built from the current git branch. The test Each e2e execution tests a Postgres Operator image built from the current git branch. The test
runner creates a new local K8s cluster using [kind](https://kind.sigs.k8s.io/), runner creates a new local K8s cluster using [kind](https://kind.sigs.k8s.io/),

5
ui/Dockerfile
View File

@ -4,7 +4,7 @@ LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>"
EXPOSE 8081 EXPOSE 8081
RUN \ RUN \
apt-get add --no-cache \ apk add --no-cache \
alpine-sdk \ alpine-sdk \
autoconf \ autoconf \
automake \ automake \
@ -25,7 +25,8 @@ RUN \
&& \ && \
rm -rf \ rm -rf \
/root/.cache \ /root/.cache \
/tmp/* /tmp/* \
/var/cache/apk/*
COPY requirements.txt / COPY requirements.txt /
COPY start_server.sh / COPY start_server.sh /

2
ui/run_local.sh
View File

@ -67,7 +67,7 @@ kubectl exec \
)" \ )" \
-- \ -- \
sh -c ' sh -c '
apt-get add --no-cache socat; apk add --no-cache socat;
pkill socat; pkill socat;
socat -v TCP-LISTEN:1234,reuseaddr,fork,su=nobody TCP:169.254.169.254:80 socat -v TCP-LISTEN:1234,reuseaddr,fork,su=nobody TCP:169.254.169.254:80
' \ ' \