diff --git a/.github/workflows/dockers_builder.yml b/.github/workflows/dockers_builder.yml index 0aa32c9d79..428d710da6 100644 --- a/.github/workflows/dockers_builder.yml +++ b/.github/workflows/dockers_builder.yml @@ -8,9 +8,6 @@ on: - '*' env: - front_debian8_components: 'tyr-web instances-configurator' - backend_debian8_components: 'kraken tyr-beat tyr-worker mock-kraken eitri' - SBX_ECR_REGISTRY_BACKEND: "110444322584.dkr.ecr.eu-west-1.amazonaws.com" SBX_ECR_REGISTRY_FRONT: "051314639660.dkr.ecr.eu-west-1.amazonaws.com" PRD_ECR_REGISTRY: "162230498103.dkr.ecr.eu-west-1.amazonaws.com" diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 9398456106..53d10d19fa 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -119,7 +119,7 @@ jobs: strategy: fail-fast: false matrix: - os: [{docker_image: mutable-debian8_dev , python_version: python3.6}, {docker_image: mutable-debian11_dev, python_version: python3.9}] + os: [{docker_image: mutable-debian11_dev, python_version: python3.9}] container: image: 162230498103.dkr.ecr.eu-west-1.amazonaws.com/${{ matrix.os.docker_image }}:latest @@ -159,16 +159,6 @@ jobs: key: ${{matrix.os.docker_image}}-ci max-size: 2000M save: ${{ github.event_name == 'push' }} - - name: Ensure CMake version is recent enough - if: ${{ matrix.os.docker_image == 'mutable-debian8_dev'}} - run: | - apt remove --yes cmake - mkdir local_bin - cd local_bin - wget https://cmake.org/files/v3.18/cmake-3.18.6-Linux-x86_64.tar.gz - tar xf cmake-3.18.6-Linux-x86_64.tar.gz - echo "`pwd`/cmake-3.18.6-Linux-x86_64/bin" >> $GITHUB_PATH - cd .. - name: configure for Release run: mkdir build && cd ./build && cmake -DSTRIP_SYMBOLS=ON ../source - name: run diff --git a/docker/debian10/Dockerfile-eitri b/docker/debian10/Dockerfile-eitri deleted file mode 100644 index d0c9e06e4c..0000000000 --- a/docker/debian10/Dockerfile-eitri +++ /dev/null @@ -1,17 +0,0 @@ -FROM navitia/master - -# copy package from context inside the docker -COPY navitia-ed_*.deb / -COPY source/ /navitia/source/ - -# install dependencies -RUN apt-get update \ - && apt-get install -y python3 python3-pip libpq-dev jq git zip curl \ - && apt-get install -y /navitia-ed_*.deb \ - && apt-get clean \ - && rm -rf /navitia-ed_*.deb - -# install eitri requirements -RUN pip3 install --no-cache-dir -r /navitia/source/eitri/requirements.txt - -CMD [""] diff --git a/docker/debian10/Dockerfile-instances-configurator b/docker/debian10/Dockerfile-instances-configurator deleted file mode 100644 index 2ff8189314..0000000000 --- a/docker/debian10/Dockerfile-instances-configurator +++ /dev/null @@ -1,17 +0,0 @@ -FROM navitia/master - -COPY source/sql/alembic /usr/share/navitia/ed/alembic -COPY source/sql/requirements.txt /tmp/requirements.txt -COPY source/cities /usr/share/navitia/cities -COPY docker/templates/* /templates/ - -RUN apt-get update \ - && apt install -y python python-pip git libpq-dev postgresql-client gettext-base \ - && apt-get clean - -RUN pip install -r /tmp/requirements.txt - -COPY docker/instances_configuration.sh / -RUN chmod +x /instances_configuration.sh - -ENTRYPOINT ["/bin/bash","/instances_configuration.sh"] diff --git a/docker/debian10/Dockerfile-jormungandr b/docker/debian10/Dockerfile-jormungandr deleted file mode 100644 index 3ac767aaf7..0000000000 --- a/docker/debian10/Dockerfile-jormungandr +++ /dev/null @@ -1,49 +0,0 @@ -FROM navitia/master - -COPY navitia-common_*.deb navitia-jormungandr_*.deb ./ - -RUN apt-get update \ - && apt install -y curl python python-pip git libgeos-c1v5 libpq5 apache2 ./navitia-common_*.deb ./navitia-jormungandr_*.deb \ - && apt-get clean \ - && apt-get autoremove \ - && rm -rf /var/lib/apt/lists/* \ - && rm -rf navitia-common_*.deb navitia-jormungandr_*.deb - -# install jormungandr requirements -RUN pip install --no-cache-dir -r /usr/share/jormungandr/requirements.txt \ - && pip install uwsgi - - -# Add apache config -RUN rm /etc/apache2/sites-available/000-default.conf -COPY docker/apache/jormungandr.default.conf /etc/apache2/sites-available/000-default.conf -COPY docker/apache/apache2.conf /etc/apache2/apache2.conf -COPY docker/apache/envvars /etc/apache2/envvars -COPY docker/apache/logformat.conf /etc/apache2/conf-available/logformat.conf - -# jormungandr wsgi -COPY docker/jormungandr.wsgi /usr/src/app/jormungandr.wsgi -COPY docker/run_jormungandr.sh /usr/src/app/run.sh - -# Enable site and modes -RUN a2ensite 000-default.conf \ - && a2enmod rewrite \ - && a2enmod proxy \ - && a2enmod proxy_balancer \ - && a2enmod proxy_http \ - && a2enconf logformat.conf - -# Redirect apache log output to docker log collector -RUN ln -sf /proc/self/fd/1 /var/log/apache2/access.log \ - && ln -sf /proc/self/fd/2 /var/log/apache2/error.log - -WORKDIR /usr/src/app/ - -ENV PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp -ENV PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2 - -HEALTHCHECK CMD curl -f http://localhost/v1 || exit 1 - -EXPOSE 80 - -ENTRYPOINT [ "/usr/src/app/run.sh" ] diff --git a/docker/debian10/Dockerfile-kraken b/docker/debian10/Dockerfile-kraken deleted file mode 100644 index dd75ea1b84..0000000000 --- a/docker/debian10/Dockerfile-kraken +++ /dev/null @@ -1,54 +0,0 @@ -FROM navitia/master - -# copy package from context inside the docker -COPY navitia-kraken_*.deb navitia-monitor-kraken_*.deb ./ - -RUN apt-get update \ - && apt install -y ./navitia-kraken_*.deb \ - && apt install -y curl python python-pip \ - && apt install -y ./navitia-monitor-kraken_*.deb \ - && apt install -y netcat --autoremove \ - && apt-get clean \ - && rm -rf navitia-kraken_*.deb \ - && rm -rf navitia-monitor-kraken_*.deb \ - && pip install --no-cache-dir -r /usr/share/monitor_kraken/requirements.txt - -COPY docker/run_kraken.sh /usr/src/app/run_kraken.sh -RUN chmod +x /usr/src/app/run_kraken.sh - -WORKDIR / -RUN ln -s /usr/lib/python*/dist-packages/monitor_kraken/app.py monitor_kraken - -# Build libkeepalive https://libkeepalive.sourceforge.net/ -# libkeepalive is a library to keep tcp connection alive. The reason of doing so is that aws LoadBalancer, to which -# kraken is connected, check the aliveness continuously at regular interval of non-customisable 350s -# (https://docs.aws.amazon.com/elasticloadbalancing/latest/network/network-load-balancers.html). If nothing happens during -# this interval, the connection will be dropped. It takes Kraken, by default, 7200s(/proc/sys/net/ipv4/tcp_keepalive_time) -# to be aware of the disconnection. By using libkeepalive, we can override tcp_keepalive_time, -# which is not customisable via docker-container. - -RUN apt install -y wget build-essential -WORKDIR /tmp/libkeepalive -COPY libkeepalive-0.3.tar.gz /tmp/libkeepalive/libkeepalive-0.3.tar.gz -RUN tar -xf libkeepalive-0.3.tar.gz && \ - cd libkeepalive-0.3 && \ - make && \ - mkdir /libkeepalive && \ - cp libkeepalive.so /libkeepalive && \ - rm -rf /tmp/libkeepalive -RUN apt purge -y wget build-essential -# User timeout = 300 + 30 * 6 = 480s -ENV KEEPIDLE=300 -ENV KEEPCNT=6 -ENV KEEPINTVL=30 -# if you are willing to use settings from os, set KEEPALIVE to off -# ENV KEEPALIVE=Off - -EXPOSE 30000 -ENV KRAKEN_GENERAL_zmq_socket=tcp://*:30000 -ENV KRAKEN_GENERAL_log_level=INFO -HEALTHCHECK CMD nc -z localhost 30000 || exit 1 - -ENV MONITOR_HOST=0.0.0.0 - -ENTRYPOINT ["bash", "/usr/src/app/run_kraken.sh"] diff --git a/docker/debian10/Dockerfile-master b/docker/debian10/Dockerfile-master deleted file mode 100644 index 99403d40bf..0000000000 --- a/docker/debian10/Dockerfile-master +++ /dev/null @@ -1,18 +0,0 @@ -FROM debian:10-slim - -# update package list from providers -RUN apt-get update && \ - apt-get upgrade -y && \ - apt-get install -y ca-certificates dh-python && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - - COPY docker/ca-certificates/*.crt /usr/local/share/ca-certificates/ - COPY docker/build_kraken.sh /build_kraken.sh - RUN chmod +x /build_kraken.sh - RUN update-ca-certificates - # Python 'requests' package handle its own CA certificate list - # Let's force it to use the OS's list - ENV REQUESTS_CA_BUNDLE /etc/ssl/certs - -CMD ["/build_kraken.sh"] diff --git a/docker/debian10/Dockerfile-mock-kraken b/docker/debian10/Dockerfile-mock-kraken deleted file mode 100644 index 9d765b741a..0000000000 --- a/docker/debian10/Dockerfile-mock-kraken +++ /dev/null @@ -1,20 +0,0 @@ -FROM navitia/master - -# copy package from context inside the docker -COPY mock-kraken_*.deb ./ - -RUN apt-get update \ - && apt install -y ./mock-kraken_*.deb \ - && apt-get clean \ - && rm -rf mock-kraken_*.deb - -RUN mkdir -p /srv/kraken \ - && ln -s /usr/bin/main_routing_test /srv/kraken/main_routing_test \ - && ln -s /usr/bin/departure_board_test /srv/kraken/departure_board_test - -WORKDIR /srv/kraken -EXPOSE 30000 -ENV KRAKEN_GENERAL_zmq_socket=tcp://*:30000 -ENV KRAKEN_GENERAL_log_level=INFO - -CMD [""] diff --git a/docker/debian10/Dockerfile-tyr-beat b/docker/debian10/Dockerfile-tyr-beat deleted file mode 100644 index 61f4bdd1f9..0000000000 --- a/docker/debian10/Dockerfile-tyr-beat +++ /dev/null @@ -1,27 +0,0 @@ -FROM navitia/master - -# used for data migrations -COPY source/sql/alembic /usr/share/navitia/ed/alembic -COPY source/sql/requirements.txt /tmp/requirements.txt -COPY source/cities /usr/share/navitia/cities -COPY docker/templates/* /templates/ - -COPY navitia-common_*.deb navitia-tyr_*.deb ./ -COPY docker/run_tyr_beat.sh / - -RUN apt-get update \ - && apt install -y python python-pip git postgresql-client libgeos-c1v5 libpq5 gettext-base jq python-pip ./navitia-common_*.deb ./navitia-tyr_*.deb \ - && apt-get clean \ - && rm -rf navitia-common_*.deb navitia-tyr_*.deb - -# install ed migrations requirements -RUN pip install -r /tmp/requirements.txt - -# install tyr requirements -RUN pip install --no-cache-dir -r /usr/share/tyr/requirements.txt - -RUN chmod +x /run_tyr_beat.sh - -WORKDIR /usr/share/tyr/ - -ENTRYPOINT ["bash", "/run_tyr_beat.sh"] diff --git a/docker/debian10/Dockerfile-tyr-web b/docker/debian10/Dockerfile-tyr-web deleted file mode 100644 index 358f51aee6..0000000000 --- a/docker/debian10/Dockerfile-tyr-web +++ /dev/null @@ -1,23 +0,0 @@ -FROM navitia/master - -COPY navitia-common_*.deb navitia-tyr_*.deb ./ - -RUN apt-get update \ - && apt install -y curl python python-pip postgresql-client git libgeos-c1v5 ./navitia-common_*.deb ./navitia-tyr_*.deb \ - && apt-get clean \ - && rm -rf navitia-common_*.deb navitia-tyr_*.deb - -# install tyr requirements -RUN pip install --no-cache-dir -r /usr/share/tyr/requirements.txt \ - && pip install uwsgi - -WORKDIR /usr/src/app/ - -RUN cp /usr/bin/manage_tyr.py /usr/src/app/manage_tyr.py - -COPY docker/run_tyr_web.sh /usr/src/app/run.sh -RUN chmod +x /usr/src/app/run.sh - -RUN ln -s /usr/share/tyr/migrations migrations - -ENTRYPOINT ["bash", "/usr/src/app/run.sh" ] diff --git a/docker/debian10/Dockerfile-tyr-worker b/docker/debian10/Dockerfile-tyr-worker deleted file mode 100644 index f905364a18..0000000000 --- a/docker/debian10/Dockerfile-tyr-worker +++ /dev/null @@ -1,38 +0,0 @@ -FROM navitia/master - -COPY navitia-common_*deb navitia-tyr_*.deb navitia-ed_*.deb navitia-cities_*.deb mimirsbrunn7_buster-*.deb cosmogony2cities_*.deb ./ - -RUN apt-get update \ - && apt install -y python python-pip git libgeos-c1v5 libpq5 \ - ./navitia-common_*.deb ./navitia-tyr_*.deb \ - ./navitia-ed_*.deb ./navitia-cities_*.deb \ - ./mimirsbrunn7_buster-*.deb ./cosmogony2cities*.deb \ - && apt-get clean \ - && rm -rf ./navitia-common_*.deb ./navitia-tyr_*.deb \ - ./navitia-ed_*.deb ./navitia-cities_*.deb \ - ./mimirsbrunn7_buster-*.deb ./cosmogony2cities*.deb - - - -RUN apt install -y --force-yes unzip -RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" -RUN unzip awscliv2.zip -RUN ./aws/install - -# install tyr requirements -RUN pip install --no-cache-dir -r /usr/share/tyr/requirements.txt - -EXPOSE 5000 - -WORKDIR /usr/src/app/ -RUN cp /usr/bin/manage_tyr.py /usr/src/app/manage_tyr.py - -# TODO change the user to remove this ugly C_FORCE_ROOT -ENV C_FORCE_ROOT=1 -ENV TYR_WORKER_N_PROC=1 - -COPY docker/run_tyr_worker.sh /usr/src/app/ - -RUN chmod +x /usr/src/app/run_tyr_worker.sh - -ENTRYPOINT ["bash", "/usr/src/app/run_tyr_worker.sh"] diff --git a/docker/debian8/Dockerfile-builder b/docker/debian8/Dockerfile-builder deleted file mode 100755 index 66b2b23530..0000000000 --- a/docker/debian8/Dockerfile-builder +++ /dev/null @@ -1,6 +0,0 @@ -FROM navitia/master - -COPY docker/build_kraken.sh /build_kraken.sh -RUN chmod +x /build_kraken.sh - -ENTRYPOINT ["bash", "/build_kraken.sh"] diff --git a/docker/debian8/Dockerfile-eitri b/docker/debian8/Dockerfile-eitri deleted file mode 100644 index 490ee35a8d..0000000000 --- a/docker/debian8/Dockerfile-eitri +++ /dev/null @@ -1,14 +0,0 @@ -FROM navitia/master - -# copy package from context inside the docker -COPY navitia-ed_*.deb / -COPY source/ /navitia/source/ - -# install navitia-ed package -RUN dpkg -i ./navitia-ed_*.deb || exit 0 -RUN apt-get install -f -y --force-yes - -RUN rm navitia-ed_*.deb - -# install eitri requirements -RUN pip install --no-cache-dir -r /navitia/source/eitri/requirements.txt diff --git a/docker/debian8/Dockerfile-instances-configurator b/docker/debian8/Dockerfile-instances-configurator deleted file mode 100644 index 5a5d9117a8..0000000000 --- a/docker/debian8/Dockerfile-instances-configurator +++ /dev/null @@ -1,15 +0,0 @@ -FROM navitia/master - - -COPY source/sql/alembic /usr/share/navitia/ed/alembic -COPY source/sql/requirements.txt /tmp/requirements.txt -RUN pip install -r /tmp/requirements.txt - -COPY source/cities /usr/share/navitia/cities - -COPY docker/instances_configuration.sh / -COPY docker/templates/* /templates/ - - - -ENTRYPOINT [ "sh", "-x", "/instances_configuration.sh" ] diff --git a/docker/debian8/Dockerfile-jormungandr b/docker/debian8/Dockerfile-jormungandr deleted file mode 100644 index 96c9eec03b..0000000000 --- a/docker/debian8/Dockerfile-jormungandr +++ /dev/null @@ -1,54 +0,0 @@ -FROM navitia/master - -COPY navitia-common_*.deb ./ -COPY navitia-jormungandr_*.deb ./ - -# install navitia-common package -RUN dpkg -i ./navitia-common_*.deb || exit 0 -RUN apt-get install -f -y --force-yes - -# install navitia-jormun package -RUN dpkg -i ./navitia-jormungandr_*.deb || exit 0 -RUN apt-get install -f -y --force-yes - -RUN apt-get install -y --force-yes apache2 \ - && apt-get clean \ - && apt-get autoremove - -# install jormungandr requirements -RUN pip install --no-cache-dir -r /usr/share/jormungandr/requirements.txt \ - && pip install uwsgi - -# Add apache config -RUN rm /etc/apache2/sites-available/000-default.conf -COPY docker/apache/jormungandr.default.conf /etc/apache2/sites-available/000-default.conf -COPY docker/apache/apache2.conf /etc/apache2/apache2.conf -COPY docker/apache/envvars /etc/apache2/envvars -COPY docker/apache/logformat.conf /etc/apache2/conf-available/logformat.conf - -# Enable site and modes -RUN a2ensite 000-default.conf \ - && a2enmod rewrite \ - && a2enmod proxy \ - && a2enmod proxy_balancer \ - && a2enmod proxy_http \ - && a2enconf logformat.conf - -# Redirect apache log output to docker log collector -RUN ln -sf /proc/self/fd/1 /var/log/apache2/access.log \ - && ln -sf /proc/self/fd/2 /var/log/apache2/error.log - -# jormungandr wsgi -COPY docker/jormungandr.wsgi /usr/src/app/jormungandr.wsgi -COPY docker/run_jormungandr.sh /usr/src/app/run.sh - -WORKDIR /usr/src/app/ - -HEALTHCHECK CMD curl -f http://localhost/v1 || exit 1 - -ENV PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp -ENV PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2 - -EXPOSE 80 - -ENTRYPOINT [ "/usr/src/app/run.sh" ] diff --git a/docker/debian8/Dockerfile-kraken b/docker/debian8/Dockerfile-kraken deleted file mode 100644 index 76941d3cf0..0000000000 --- a/docker/debian8/Dockerfile-kraken +++ /dev/null @@ -1,57 +0,0 @@ -FROM navitia/master - - -# copy package from context inside the docker -COPY navitia-kraken_*.deb navitia-monitor-kraken_*.deb ./ - -# install navitia-kraken package -RUN dpkg -i ./navitia-kraken_*.deb ./navitia-monitor-kraken_*.deb -RUN apt-get install -f -y --force-yes - -RUN rm navitia-kraken_*.deb \ - navitia-monitor-kraken_*.deb - -# put the binary in /srv/kraken -RUN mkdir -p /srv/kraken -RUN cp /usr/bin/kraken /srv/kraken/kraken - -RUN pip install --no-cache-dir -r /usr/share/monitor_kraken/requirements.txt - -COPY docker/run_kraken.sh /usr/src/app/run_kraken.sh -RUN chmod +x /usr/src/app/run_kraken.sh - -WORKDIR / -RUN ln -s /usr/lib/python*/dist-packages/monitor_kraken/app.py monitor_kraken - -EXPOSE 30000 - -ENV KRAKEN_GENERAL_zmq_socket=tcp://*:30000 -ENV KRAKEN_GENERAL_log_level=INFO -HEALTHCHECK CMD nc -z localhost 30000 || exit 1 - -ENV MONITOR_HOST=0.0.0.0 - -# Build libkeepalive https://libkeepalive.sourceforge.net/ -# libkeepalive is a library to keep tcp connection alive. The reason of doing so is that aws LoadBalancer, to which -# kraken is connected, check the aliveness continuously at regular interval of non-customisable 350s -# (https://docs.aws.amazon.com/elasticloadbalancing/latest/network/network-load-balancers.html). If nothing happens during -# this interval, the connection will be dropped. It takes Kraken, by default, 7200s(/proc/sys/net/ipv4/tcp_keepalive_time) -# to be aware of the disconnection. By using libkeepalive, we can override tcp_keepalive_time, -# which is not customisable via docker-container. - -WORKDIR /tmp/libkeepalive -COPY docker/libkeepalive-0.3/ /tmp/libkeepalive/ -RUN cd /tmp/libkeepalive/ && \ - make && \ - mkdir /libkeepalive && \ - cp /tmp/libkeepalive/libkeepalive.so /libkeepalive && \ - rm -rf /tmp/libkeepalive - -# User timeout = 300 + 30 * 6 = 480s -ENV KEEPIDLE=300 -ENV KEEPCNT=6 -ENV KEEPINTVL=30 -# if you are willing to use settings from os, set KEEPALIVE to off -# ENV KEEPALIVE=Off - -ENTRYPOINT ["bash", "/usr/src/app/run_kraken.sh"] diff --git a/docker/debian8/Dockerfile-master b/docker/debian8/Dockerfile-master deleted file mode 100755 index d628fdac3e..0000000000 --- a/docker/debian8/Dockerfile-master +++ /dev/null @@ -1,41 +0,0 @@ -FROM 162230498103.dkr.ecr.eu-west-1.amazonaws.com/mutable-debian8_dev:latest - -RUN echo "deb http://archive.debian.org/debian/ jessie main" > /etc/apt/sources.list.d/archive.list - -# update package list from providers -RUN apt-get update --force-yes --fix-missing || exit 0 - -# install postgresql-client for tyr-beat -# netcat for kraken -# curl for jormun -RUN apt-get install -y --force-yes ca-certificates \ - postgresql-client \ - netcat \ - dh-python \ - curl - -COPY docker/ca-certificates/*.crt /usr/local/share/ca-certificates/ -RUN update-ca-certificates - -# install a more recent version of CMake -RUN apt-get remove --yes cmake \ - && cd /tmp \ - && wget https://cmake.org/files/v3.18/cmake-3.18.6-Linux-x86_64.tar.gz \ - && tar xf cmake-3.18.6-Linux-x86_64.tar.gz --strip-components=1 --directory=/usr/local \ - && rm -f cmake-3.18.6-Linux-x86_64.tar.gz \ - && cd - - -# Python 'requests' package handle its own CA certificate list -# Let's force it to use the OS's list -ENV REQUESTS_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt - -# install rustup -ENV RUSTUP_HOME=/usr/local/rustup \ - CARGO_HOME=/usr/local/cargo - -ENV PATH=/usr/local/cargo/bin:${PATH} -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal \ - && chmod -R a+wrX ${RUSTUP_HOME} ${CARGO_HOME} \ - && rustup --version \ - && cargo --version \ - && rustc --version diff --git a/docker/debian8/Dockerfile-mock-kraken b/docker/debian8/Dockerfile-mock-kraken deleted file mode 100644 index 647b45ccc6..0000000000 --- a/docker/debian8/Dockerfile-mock-kraken +++ /dev/null @@ -1,20 +0,0 @@ -FROM navitia/master - -# copy package from context inside the docker -COPY mock-kraken_*.deb ./ - -# install mock-kraken package -RUN dpkg -i ./mock-kraken_*.deb -RUN apt-get install -f -y --force-yes - -RUN rm mock-kraken_*.deb - -RUN mkdir -p /srv/kraken -RUN cp /usr/bin/main_routing_test /srv/kraken/ -RUN cp /usr/bin/departure_board_test /srv/kraken/ -WORKDIR /srv/kraken -EXPOSE 30000 -ENV KRAKEN_GENERAL_zmq_socket=tcp://*:30000 -ENV KRAKEN_GENERAL_log_level=INFO - - diff --git a/docker/debian8/Dockerfile-tyr-beat b/docker/debian8/Dockerfile-tyr-beat deleted file mode 100644 index 01b026b324..0000000000 --- a/docker/debian8/Dockerfile-tyr-beat +++ /dev/null @@ -1,38 +0,0 @@ -FROM navitia/master - -COPY navitia-common_*.deb navitia-tyr_*.deb ./ - -RUN apt-get update \ - && apt install -y --force-yes jq - -# used for data migrations -COPY source/sql/alembic /usr/share/navitia/ed/alembic -COPY source/sql/requirements.txt /tmp/requirements.txt -COPY source/cities /usr/share/navitia/cities -COPY docker/templates/* /templates/ - -# install navitia-common package -RUN dpkg -i ./navitia-common_*.deb || exit 0 - -# install navitia-tyr package -RUN dpkg -i ./navitia-tyr_*.deb || exit 0 - -RUN apt-get install -f -y --force-yes - -RUN rm navitia-common_*.deb \ - navitia-tyr_*.deb - -# install ed migrations requirements -RUN pip install -r /tmp/requirements.txt - -# install tyr requirements -RUN pip install --no-cache-dir -r /usr/share/tyr/requirements.txt - -# install postgresql-client -RUN apt-get install -y --force-yes postgresql-client - -COPY docker/run_tyr_beat.sh / -RUN chmod +x /run_tyr_beat.sh - -WORKDIR /usr/share/tyr/ -ENTRYPOINT ["bash", "/run_tyr_beat.sh"] diff --git a/docker/debian8/Dockerfile-tyr-web b/docker/debian8/Dockerfile-tyr-web deleted file mode 100644 index 6a49c6ba0f..0000000000 --- a/docker/debian8/Dockerfile-tyr-web +++ /dev/null @@ -1,33 +0,0 @@ -FROM navitia/master - -COPY navitia-common_*.deb navitia-tyr_*.deb ./ - -# install navitia-common package -RUN dpkg -i ./navitia-common_*.deb || exit 0 - -# install navitia-tyr package -RUN dpkg -i ./navitia-tyr_*.deb || exit 0 - -RUN apt-get install -f -y --force-yes - -RUN rm navitia-common_*.deb \ - navitia-tyr_*.deb - -# install postgresql-client -RUN apt-get install -y --force-yes postgresql-client - -# install tyr requirements -RUN pip install --no-cache-dir -r /usr/share/tyr/requirements.txt - -# install uwsgi -RUN pip install uwsgi==2.0.22 - -WORKDIR /usr/src/app/ -RUN cp /usr/bin/manage_tyr.py /usr/src/app/manage_tyr.py - -COPY docker/run_tyr_web.sh /usr/src/app/run.sh -RUN chmod +x /usr/src/app/run.sh - -RUN ln -s /usr/share/tyr/migrations migrations - -ENTRYPOINT ["bash", "/usr/src/app/run.sh" ] diff --git a/docker/debian8/Dockerfile-tyr-worker b/docker/debian8/Dockerfile-tyr-worker deleted file mode 100644 index 7e5b56100d..0000000000 --- a/docker/debian8/Dockerfile-tyr-worker +++ /dev/null @@ -1,69 +0,0 @@ -FROM navitia/master - -# Install some binaries from tartare-tools -ENV TARTARE_TOOLS_VERSION="v0.47.1" -ARG GITHUB_TOKEN -RUN git config --global url."https://x-access-token:${GITHUB_TOKEN}@github.com/hove-io/".insteadOf "ssh://git@github.com/hove-io/" -RUN git clone -b ${TARTARE_TOOLS_VERSION} --depth 1 https://x-access-token:${GITHUB_TOKEN}@github.com/hove-io/tartare-tools - -# rustc 1.80.0 broke the compilation -RUN rustup install 1.79.0 - -RUN cd tartare-tools \ - && cargo +1.79.0 build --release -p enrich-ntfs-with-addresses \ - && cargo +1.79.0 build --release -p split-trip-geometries \ - && cp target/release/enrich-ntfs-with-addresses /usr/bin/ \ - && cp target/release/split-trip-geometries /usr/bin/ \ - && cd .. \ - && rm -rf tartare-tools - -COPY navitia-common_*deb navitia-tyr_*.deb navitia-ed_*.deb navitia-cities_*.deb mimirsbrunn7_jessie-*.deb cosmogony2cities_*.deb mimirsbrunn-config-*.deb ./ - -# install navitia-common package -RUN dpkg -i ./navitia-common_*.deb || exit 0 - -# install navitia-tyr package -RUN dpkg -i ./navitia-tyr_*.deb || exit 0 - -# install navitia-ed package -RUN dpkg -i ./navitia-ed_*.deb || exit 0 - -# install navitia-cities package -RUN dpkg -i ./navitia-cities_*.deb || exit 0 - -# install navitia-mimirsbrunn package -RUN dpkg -i ./mimirsbrunn7_jessie-*.deb \ - # install cosmogony2cities package - ./cosmogony2cities*.deb \ - # install conf mimir package - ./mimirsbrunn-config-*.deb - -RUN apt-get install -f -y --force-yes - -RUN rm navitia-common_*deb \ - navitia-tyr_*.deb \ - navitia-cities_*.deb \ - navitia-ed_*.deb \ - mimirsbrunn-config-*.deb \ - mimirsbrunn7_jessie-*.deb \ - cosmogony2cities_*.deb - -# install tyr requirements -RUN pip install --no-cache-dir -r /usr/share/tyr/requirements.txt - -RUN apt install -y --force-yes unzip -RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" -RUN unzip awscliv2.zip -RUN ./aws/install - - -EXPOSE 5000 - - -WORKDIR /usr/src/app/ -RUN cp /usr/bin/manage_tyr.py /usr/src/app/manage_tyr.py - -# TODO change the user to remove this ugly C_FORCE_ROOT -ENV C_FORCE_ROOT=1 -ENV TYR_WORKER_N_PROC=1 -ENTRYPOINT ["celery", "worker", "-A", "tyr.tasks", "-O", "fair"]