diff --git a/dist/ci/docker-compose.yml b/dist/ci/docker-compose.yml index 76bc05ea..052abed6 100644 --- a/dist/ci/docker-compose.yml +++ b/dist/ci/docker-compose.yml @@ -28,7 +28,7 @@ services: - cache - srcserver - repserver - - servicedispatch + - serviceserver ports: - "0.0.0.0:${OSRT_EXPOSED_OBS_PORT:-3000}:3000" srcserver: @@ -37,9 +37,9 @@ services: repserver: <<: *obs command: chroot --userspec=obsrun / /usr/lib/obs/server/bs_repserver - servicedispatch: + serviceserver: <<: *obs - command: chroot --userspec=obsrun / /usr/lib/obs/server/bs_servicedispatch + command: /usr/lib/obs/server/bs_service smtp: <<: *testenv command: python3 /code/dist/ci/smtp/eml-server.py diff --git a/dist/ci/miniobs/Dockerfile b/dist/ci/miniobs/Dockerfile index 9437c811..0acd0241 100644 --- a/dist/ci/miniobs/Dockerfile +++ b/dist/ci/miniobs/Dockerfile @@ -6,7 +6,8 @@ RUN zypper ar http://download.opensuse.org/repositories/OBS:/Server:/Unstable/15 RUN zypper install -y obs-api obs-worker obs-server \ ca-certificates patch vim vim-data psmisc timezone \ - glibc-locale aaa_base aaa_base-extras netcat net-tools + glibc-locale aaa_base aaa_base-extras netcat net-tools \ + obs-service-recompress obs-service-format_spec_file COPY database.yml.local /srv/www/obs/api/config/database.yml