Skip to content
Snippets Groups Projects
Commit 93ea4c07 authored by Felix Delattre's avatar Felix Delattre
Browse files

Removed older Ubuntu versions, added supported Debian and Ubuntu versions, and...

Removed older Ubuntu versions, added supported Debian and Ubuntu versions, and added one example to pull OBM debs
parent 2e83fe85
No related branches found
No related tags found
No related merge requests found
......@@ -16,21 +16,16 @@
FROM debian:bullseye-slim
RUN apt-get update && apt-get install -y \
gnupg2 \
software-properties-common \
supervisor \
wget
RUN wget https://deb.openbuildingmap.org/archive.key && apt-key add archive.key
RUN add-apt-repository 'deb https://deb.openbuildingmap.org/ bullseye main'
RUN apt-get update && apt-get install -y \
RUN apt-get update && apt-get install --no-install-recommends -y \
apache2 \
libapache2-mod-tile \
renderd \
renderd-example-map
supervisor
EXPOSE 80
RUN a2enmod tile
RUN mkdir /run/renderd
COPY ./files/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
CMD ["/usr/bin/supervisord"]
# Copyright (c) 2020:
# Deutsches GeoForschungsZentrum GFZ <https://www.gfz-potsdam.de>
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or (at
# your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
# General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see http://www.gnu.org/licenses/.
FROM ubuntu:groovy
RUN apt-get update && apt-get install -y \
gnupg2 \
software-properties-common \
wget
RUN wget https://deb.openbuildingmap.org/archive.key && apt-key add archive.key
RUN add-apt-repository 'deb https://deb.openbuildingmap.org/ buster main'
RUN apt-get update && apt-get install -y \
libapache2-mod-tile \
renderd \
renderd-example-map
EXPOSE 80
COPY ./files/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
CMD ["/usr/bin/supervisord"]
......@@ -14,22 +14,18 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see http://www.gnu.org/licenses/.
FROM ubuntu:focal
FROM ubuntu:hirsute
RUN apt-get update && apt-get install -y \
gnupg2 \
software-properties-common \
wget
RUN wget https://deb.openbuildingmap.org/archive.key && apt-key add archive.key
RUN add-apt-repository 'deb https://deb.openbuildingmap.org/ buster main'
RUN apt-get update && apt-get install -y \
RUN apt-get update && apt-get install --no-install-recommends -y \
apache2 \
libapache2-mod-tile \
renderd \
renderd-example-map
supervisor
EXPOSE 80
RUN a2enmod tile
RUN mkdir /run/renderd
COPY ./files/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
CMD ["/usr/bin/supervisord"]
......@@ -14,15 +14,16 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see http://www.gnu.org/licenses/.
FROM debian:buster-slim
FROM debian:bullseye-slim
RUN apt-get update && apt-get install -y \
gnupg2 \
software-properties-common \
supervisor \
wget
RUN wget https://deb.openbuildingmap.org/archive.key && apt-key add archive.key
RUN add-apt-repository 'deb https://deb.openbuildingmap.org/ buster main'
RUN add-apt-repository 'deb https://deb.openbuildingmap.org/ bullseye main'
RUN apt-get update && apt-get install -y \
libapache2-mod-tile \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment