From 3be43f3caa4ad015ec10fbf5dab9cf510ebc971d Mon Sep 17 00:00:00 2001 From: 3nprob <3nprob@3nprob> Date: Sun, 14 Nov 2021 17:03:00 +0900 Subject: [PATCH 1/2] Rename ody-intergration-test -> ody-integration-test --- docker/Dockerfile | 10 +++++----- docker/entrypoint.sh | 2 +- .../go.mod | 0 .../go.sum | 0 .../pkg/cleint-server.go | 0 .../pkg/main.go | 0 .../pkg/pkg-sync.go | 0 .../pkg/showerrs.go | 0 .../pkg/signals.go | 0 .../pkg/util.go | 0 10 files changed, 6 insertions(+), 6 deletions(-) rename docker/{ody-intergration-test => ody-integration-test}/go.mod (100%) rename docker/{ody-intergration-test => ody-integration-test}/go.sum (100%) rename docker/{ody-intergration-test => ody-integration-test}/pkg/cleint-server.go (100%) rename docker/{ody-intergration-test => ody-integration-test}/pkg/main.go (100%) rename docker/{ody-intergration-test => ody-integration-test}/pkg/pkg-sync.go (100%) rename docker/{ody-intergration-test => ody-integration-test}/pkg/showerrs.go (100%) rename docker/{ody-intergration-test => ody-integration-test}/pkg/signals.go (100%) rename docker/{ody-intergration-test => ody-integration-test}/pkg/util.go (100%) diff --git a/docker/Dockerfile b/docker/Dockerfile index 6bf3e3d0..5af83823 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,11 +1,11 @@ FROM golang:latest as base -RUN mkdir -p /ody-intergration-test -COPY ./docker/ody-intergration-test /ody-intergration-test +RUN mkdir -p /ody-integration-test +COPY ./docker/ody-integration-test /ody-integration-test -WORKDIR /ody-intergration-test +WORKDIR /ody-integration-test -RUN go mod download && cd pkg && go build -o ody-intergration-test +RUN go mod download && cd pkg && go build -o ody-integration-test FROM ubuntu:focal @@ -52,7 +52,7 @@ RUN mkdir /tmp/odyssey COPY ./docker/odyssey.conf /etc/odyssey/odyssey.conf -COPY --from=base /ody-intergration-test/pkg/ody-intergration-test /ody-intergration-test +COPY --from=base /ody-integration-test/pkg/ody-integration-test /ody-integration-test COPY ./docker/scram /scram COPY ./docker/ldap /ldap COPY ./docker/shell-test /shell-test diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 832e47f7..ac6fcaa3 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -10,7 +10,7 @@ setup #/scram/test_scram.sh ody-start -/ody-intergration-test +/ody-integration-test ody-stop /usr/bin/odyssey-asan /etc/odyssey/odyssey.conf diff --git a/docker/ody-intergration-test/go.mod b/docker/ody-integration-test/go.mod similarity index 100% rename from docker/ody-intergration-test/go.mod rename to docker/ody-integration-test/go.mod diff --git a/docker/ody-intergration-test/go.sum b/docker/ody-integration-test/go.sum similarity index 100% rename from docker/ody-intergration-test/go.sum rename to docker/ody-integration-test/go.sum diff --git a/docker/ody-intergration-test/pkg/cleint-server.go b/docker/ody-integration-test/pkg/cleint-server.go similarity index 100% rename from docker/ody-intergration-test/pkg/cleint-server.go rename to docker/ody-integration-test/pkg/cleint-server.go diff --git a/docker/ody-intergration-test/pkg/main.go b/docker/ody-integration-test/pkg/main.go similarity index 100% rename from docker/ody-intergration-test/pkg/main.go rename to docker/ody-integration-test/pkg/main.go diff --git a/docker/ody-intergration-test/pkg/pkg-sync.go b/docker/ody-integration-test/pkg/pkg-sync.go similarity index 100% rename from docker/ody-intergration-test/pkg/pkg-sync.go rename to docker/ody-integration-test/pkg/pkg-sync.go diff --git a/docker/ody-intergration-test/pkg/showerrs.go b/docker/ody-integration-test/pkg/showerrs.go similarity index 100% rename from docker/ody-intergration-test/pkg/showerrs.go rename to docker/ody-integration-test/pkg/showerrs.go diff --git a/docker/ody-intergration-test/pkg/signals.go b/docker/ody-integration-test/pkg/signals.go similarity index 100% rename from docker/ody-intergration-test/pkg/signals.go rename to docker/ody-integration-test/pkg/signals.go diff --git a/docker/ody-intergration-test/pkg/util.go b/docker/ody-integration-test/pkg/util.go similarity index 100% rename from docker/ody-intergration-test/pkg/util.go rename to docker/ody-integration-test/pkg/util.go From a3d2e0f72f56c81f81bd578603ec8c6c922fef1d Mon Sep 17 00:00:00 2001 From: 3nprob <3nprob@3nprob> Date: Sun, 14 Nov 2021 17:03:51 +0900 Subject: [PATCH 2/2] Rename cleint-server.go -> client-server.go --- .../pkg/{cleint-server.go => client-server.go} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker/ody-integration-test/pkg/{cleint-server.go => client-server.go} (100%) diff --git a/docker/ody-integration-test/pkg/cleint-server.go b/docker/ody-integration-test/pkg/client-server.go similarity index 100% rename from docker/ody-integration-test/pkg/cleint-server.go rename to docker/ody-integration-test/pkg/client-server.go