Remove adding custom hosts from Dockerfiles and move to compose files

This commit is contained in:
Deda 2024-03-20 09:26:38 +01:00
parent d73e0b02c3
commit 25d0f5dc81
20 changed files with 69 additions and 50 deletions

View File

@ -6,6 +6,9 @@ services:
context: amzn-2
args:
TOOLCHAIN_VERSION: "v4"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v4_amzn-2"
mgbuild_v4_centos-7:
@ -14,6 +17,9 @@ services:
context: centos-7
args:
TOOLCHAIN_VERSION: "v4"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v4_centos-7"
mgbuild_v4_centos-9:
@ -22,6 +28,9 @@ services:
context: centos-9
args:
TOOLCHAIN_VERSION: "v4"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v4_centos-9"
mgbuild_v4_debian-10:
@ -30,6 +39,9 @@ services:
context: debian-10
args:
TOOLCHAIN_VERSION: "v4"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v4_debian-10"
mgbuild_v4_debian-11:
@ -38,6 +50,9 @@ services:
context: debian-11
args:
TOOLCHAIN_VERSION: "v4"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v4_debian-11"
mgbuild_v4_fedora-36:
@ -46,6 +61,9 @@ services:
context: fedora-36
args:
TOOLCHAIN_VERSION: "v4"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v4_fedora-36"
mgbuild_v4_ubuntu-18.04:
@ -54,6 +72,9 @@ services:
context: ubuntu-18.04
args:
TOOLCHAIN_VERSION: "v4"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v4_ubuntu-18.04"
mgbuild_v4_ubuntu-20.04:
@ -62,6 +83,9 @@ services:
context: ubuntu-20.04
args:
TOOLCHAIN_VERSION: "v4"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v4_ubuntu-20.04"
mgbuild_v4_ubuntu-22.04:
@ -70,4 +94,7 @@ services:
context: ubuntu-22.04
args:
TOOLCHAIN_VERSION: "v4"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v4_ubuntu-22.04"

View File

@ -6,6 +6,9 @@ services:
context: amzn-2
args:
TOOLCHAIN_VERSION: "v5"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v5_amzn-2"
mgbuild_v5_centos-7:
@ -14,6 +17,9 @@ services:
context: centos-7
args:
TOOLCHAIN_VERSION: "v5"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v5_centos-7"
mgbuild_v5_centos-9:
@ -22,6 +28,9 @@ services:
context: centos-9
args:
TOOLCHAIN_VERSION: "v5"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v5_centos-9"
mgbuild_v5_debian-11:
@ -30,6 +39,9 @@ services:
context: debian-11
args:
TOOLCHAIN_VERSION: "v5"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v5_debian-11"
mgbuild_v5_debian-12:
@ -38,6 +50,9 @@ services:
context: debian-12
args:
TOOLCHAIN_VERSION: "v5"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v5_debian-12"
mgbuild_v5_fedora-38:
@ -46,6 +61,9 @@ services:
context: fedora-38
args:
TOOLCHAIN_VERSION: "v5"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v5_fedora-38"
mgbuild_v5_fedora-39:
@ -54,6 +72,9 @@ services:
context: fedora-39
args:
TOOLCHAIN_VERSION: "v5"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v5_fedora-39"
mgbuild_v5_rocky-9.3:
@ -62,6 +83,9 @@ services:
context: rocky-9.3
args:
TOOLCHAIN_VERSION: "v5"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v5_rocky-9.3"
mgbuild_v5_ubuntu-20.04:
@ -70,6 +94,9 @@ services:
context: ubuntu-20.04
args:
TOOLCHAIN_VERSION: "v5"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v5_ubuntu-20.04"
mgbuild_v5_ubuntu-22.04:
@ -78,4 +105,7 @@ services:
context: ubuntu-22.04
args:
TOOLCHAIN_VERSION: "v5"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v5_ubuntu-22.04"

View File

@ -21,9 +21,6 @@ RUN git clone https://github.com/memgraph/memgraph.git \
&& ./environment/os/amzn-2.sh install MEMGRAPH_BUILD_DEPS \
&& cd .. && rm -rf memgraph
# Add mgdeps-cache and bench-graph-api hostnames
RUN echo -e "10.42.16.10 mgdeps-cache\n10.42.16.10 bench-graph-api" >> /etc/hosts
# Create mg user and set as default
RUN useradd -m -s /bin/bash mg
USER mg

View File

@ -7,6 +7,9 @@ services:
context: debian-11-arm
args:
TOOLCHAIN_VERSION: "v4"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v4_debian-11-arm"
mgbuild_v4_ubuntu-22.04-arm:
@ -15,4 +18,7 @@ services:
context: ubuntu-22.04-arm
args:
TOOLCHAIN_VERSION: "v4"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v4_ubuntu-22.04-arm"

View File

@ -7,6 +7,9 @@ services:
context: debian-12-arm
args:
TOOLCHAIN_VERSION: "v5"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v5_debian-12-arm"
mgbuild_v5_ubuntu-22.04-arm:
@ -15,4 +18,7 @@ services:
context: ubuntu-22.04-arm
args:
TOOLCHAIN_VERSION: "v5"
extra_hosts:
- "mgdeps-cache:10.42.16.10"
- "bench-graph-api:10.42.16.10"
container_name: "mgbuild_v5_ubuntu-22.04-arm"

View File

@ -20,9 +20,6 @@ RUN git clone https://github.com/memgraph/memgraph.git \
&& ./environment/os/centos-7.sh install MEMGRAPH_BUILD_DEPS \
&& cd .. && rm -rf memgraph
# Add mgdeps-cache and bench-graph-api hostnames
RUN echo -e "10.42.16.10 mgdeps-cache\n10.42.16.10 bench-graph-api" >> /etc/hosts
# Create mg user and set as default
RUN useradd -m -s /bin/bash mg
USER mg

View File

@ -20,9 +20,6 @@ RUN git clone https://github.com/memgraph/memgraph.git \
&& ./environment/os/centos-9.sh install MEMGRAPH_BUILD_DEPS \
&& cd .. && rm -rf memgraph
# Add mgdeps-cache and bench-graph-api hostnames
RUN echo -e "10.42.16.10 mgdeps-cache\n10.42.16.10 bench-graph-api" >> /etc/hosts
# Create mg user and set as default
RUN useradd -m -s /bin/bash mg
USER mg

View File

@ -23,9 +23,6 @@ RUN git clone https://github.com/memgraph/memgraph.git \
&& ./environment/os/debian-10.sh install MEMGRAPH_BUILD_DEPS \
&& cd .. && rm -rf memgraph
# Add mgdeps-cache and bench-graph-api hostnames
RUN echo -e "10.42.16.10 mgdeps-cache\n10.42.16.10 bench-graph-api" >> /etc/hosts
# Create mg user and set as default
RUN useradd -m -s /bin/bash mg
USER mg

View File

@ -23,9 +23,6 @@ RUN git clone https://github.com/memgraph/memgraph.git \
&& ./environment/os/debian-11-arm.sh install MEMGRAPH_BUILD_DEPS \
&& cd .. && rm -rf memgraph
# Add mgdeps-cache and bench-graph-api hostnames
RUN echo -e "10.42.16.10 mgdeps-cache\n10.42.16.10 bench-graph-api" >> /etc/hosts
# Create mg user and set as default
RUN useradd -m -s /bin/bash mg
USER mg

View File

@ -23,9 +23,6 @@ RUN git clone https://github.com/memgraph/memgraph.git \
&& ./environment/os/debian-11.sh install MEMGRAPH_BUILD_DEPS \
&& cd .. && rm -rf memgraph
# Add mgdeps-cache and bench-graph-api hostnames
RUN echo -e "10.42.16.10 mgdeps-cache\n10.42.16.10 bench-graph-api" >> /etc/hosts
# Create mg user and set as default
RUN useradd -m -s /bin/bash mg
USER mg

View File

@ -23,9 +23,6 @@ RUN git clone https://github.com/memgraph/memgraph.git \
&& ./environment/os/debian-12-arm.sh install MEMGRAPH_BUILD_DEPS \
&& cd .. && rm -rf memgraph
# Add mgdeps-cache and bench-graph-api hostnames
RUN echo -e "10.42.16.10 mgdeps-cache\n10.42.16.10 bench-graph-api" >> /etc/hosts
# Create mg user and set as default
RUN useradd -m -s /bin/bash mg
USER mg

View File

@ -23,9 +23,6 @@ RUN git clone https://github.com/memgraph/memgraph.git \
&& ./environment/os/debian-12.sh install MEMGRAPH_BUILD_DEPS \
&& cd .. && rm -rf memgraph
# Add mgdeps-cache and bench-graph-api hostnames
RUN echo -e "10.42.16.10 mgdeps-cache\n10.42.16.10 bench-graph-api" >> /etc/hosts
# Create mg user and set as default
RUN useradd -m -s /bin/bash mg
USER mg

View File

@ -21,9 +21,6 @@ RUN git clone https://github.com/memgraph/memgraph.git \
&& ./environment/os/fedora-36.sh install MEMGRAPH_BUILD_DEPS \
&& cd .. && rm -rf memgraph
# Add mgdeps-cache and bench-graph-api hostnames
RUN echo -e "10.42.16.10 mgdeps-cache\n10.42.16.10 bench-graph-api" >> /etc/hosts
# Create mg user and set as default
RUN useradd -m -s /bin/bash mg
USER mg

View File

@ -21,9 +21,6 @@ RUN git clone https://github.com/memgraph/memgraph.git \
&& ./environment/os/fedora-38.sh install MEMGRAPH_BUILD_DEPS \
&& cd .. && rm -rf memgraph
# Add mgdeps-cache and bench-graph-api hostnames
RUN echo -e "10.42.16.10 mgdeps-cache\n10.42.16.10 bench-graph-api" >> /etc/hosts
# Create mg user and set as default
RUN useradd -m -s /bin/bash mg
USER mg

View File

@ -21,9 +21,6 @@ RUN git clone https://github.com/memgraph/memgraph.git \
&& ./environment/os/fedora-39.sh install MEMGRAPH_BUILD_DEPS \
&& cd .. && rm -rf memgraph
# Add mgdeps-cache and bench-graph-api hostnames
RUN echo -e "10.42.16.10 mgdeps-cache\n10.42.16.10 bench-graph-api" >> /etc/hosts
# Create mg user and set as default
RUN useradd -m -s /bin/bash mg
USER mg

View File

@ -21,9 +21,6 @@ RUN git clone https://github.com/memgraph/memgraph.git \
&& ./environment/os/rocky-9.3.sh install MEMGRAPH_BUILD_DEPS \
&& cd .. && rm -rf memgraph
# Add mgdeps-cache and bench-graph-api hostnames
RUN echo -e "10.42.16.10 mgdeps-cache\n10.42.16.10 bench-graph-api" >> /etc/hosts
# Create mg user and set as default
RUN useradd -m -s /bin/bash mg
USER mg

View File

@ -23,9 +23,6 @@ RUN git clone https://github.com/memgraph/memgraph.git \
&& ./environment/os/ubuntu-18.04.sh install MEMGRAPH_BUILD_DEPS \
&& cd .. && rm -rf memgraph
# Add mgdeps-cache and bench-graph-api hostnames
RUN echo -e "10.42.16.10 mgdeps-cache\n10.42.16.10 bench-graph-api" >> /etc/hosts
# Create mg user and set as default
RUN useradd -m -s /bin/bash mg
USER mg

View File

@ -23,9 +23,6 @@ RUN git clone https://github.com/memgraph/memgraph.git \
&& ./environment/os/ubuntu-20.04.sh install MEMGRAPH_BUILD_DEPS \
&& cd .. && rm -rf memgraph
# Add mgdeps-cache and bench-graph-api hostnames
RUN echo -e "10.42.16.10 mgdeps-cache\n10.42.16.10 bench-graph-api" >> /etc/hosts
# Create mg user and set as default
RUN useradd -m -s /bin/bash mg
USER mg

View File

@ -23,11 +23,6 @@ RUN git clone https://github.com/memgraph/memgraph.git \
&& ./environment/os/ubuntu-22.04-arm.sh install MEMGRAPH_BUILD_DEPS \
&& cd .. && rm -rf memgraph
# Add mgdeps-cache and bench-graph-api hostnames
RUN echo -e "10.42.16.10 mgdeps-cache\n10.42.16.10 bench-graph-api" >> /tmp/hosts \
&& cp /tmp/hosts /etc/hosts \
&& rm /tmp/hosts
# Create mg user and set as default
RUN useradd -m -s /bin/bash mg
USER mg

View File

@ -23,9 +23,6 @@ RUN git clone https://github.com/memgraph/memgraph.git \
&& ./environment/os/ubuntu-22.04.sh install MEMGRAPH_BUILD_DEPS \
&& cd .. && rm -rf memgraph
# Add mgdeps-cache and bench-graph-api hostnames
RUN echo -e "10.42.16.10 mgdeps-cache\n10.42.16.10 bench-graph-api" >> /etc/hosts
# Create mg user and set as default
RUN useradd -m -s /bin/bash mg
USER mg