diff --git a/tests/acceptance/docker/src/opencloud-base.yml b/tests/acceptance/docker/src/opencloud-base.yml index 1a7895ace..c7d487f87 100644 --- a/tests/acceptance/docker/src/opencloud-base.yml +++ b/tests/acceptance/docker/src/opencloud-base.yml @@ -1,10 +1,7 @@ services: opencloud-server: - build: - dockerfile: opencloud.Dockerfile - context: ./ - args: - OC_IMAGE_TAG: $OC_IMAGE_TAG + image: opencloudeu/opencloud:dev + entrypoint: [ "/bin/sh", "/usr/bin/serve-opencloud.sh" ] user: root environment: WITH_WRAPPER: $WITH_WRAPPER @@ -61,3 +58,4 @@ services: volumes: - ../../../config:/woodpecker/src/github.com/opencloud-eu/opencloud/tests/config - ../../../ocwrapper/bin/ocwrapper:/usr/bin/ocwrapper + - ./serve-opencloud.sh:/usr/bin/serve-opencloud.sh diff --git a/tests/acceptance/docker/src/opencloud.Dockerfile b/tests/acceptance/docker/src/opencloud.Dockerfile deleted file mode 100644 index c27911625..000000000 --- a/tests/acceptance/docker/src/opencloud.Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -# custom Dockerfile required to run ocwrapper command -# mounting 'ocwrapper' binary doesn't work with image 'amd64/alpine:3.17' (busybox based) - -ARG OC_IMAGE_TAG -FROM opencloudeu/opencloud:${OC_IMAGE_TAG} AS opencloud - -FROM ubuntu:22.04 -COPY --from=opencloud /usr/bin/opencloud /usr/bin/opencloud -RUN apt-get update && apt-get install -y inotify-tools - -COPY ["./serve-opencloud.sh", "/usr/bin/serve-opencloud"] -RUN chmod +x /usr/bin/serve-opencloud - -ENTRYPOINT [ "serve-opencloud" ] \ No newline at end of file