sam/obmp-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates for l3vpn

Browse Source
This commit is contained in:
Tim Evens 2022-02-14 14:36:36 -08:00
parent 7d4480a558
commit a1d00198dd
4 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
collector/Dockerfile
View File

@ -1,3 +1,4 @@
# syntax=docker/dockerfile:1.3
# Collector: openbmp/collector # Collector: openbmp/collector
# #
# Copyright (c) 2021-2022 Cisco Systems, Inc. and Tim Evens. All rights reserved. # Copyright (c) 2021-2022 Cisco Systems, Inc. and Tim Evens. All rights reserved.
@ -13,9 +14,12 @@
# Change directories to obmp-docker/collector and run the below from that # Change directories to obmp-docker/collector and run the below from that
# directory. # directory.
# #
# Use buildkit - either via export DOCKER_BUILDKIT=1 or by using buildx cli
#
# Example docker build: # Example docker build:
# tar -cL -C ../../ ./obmp-collector ./obmp-docker/collector \ # tar -c -C ../../ ./obmp-collector ./obmp-docker/collector \
# | docker build --platform linux/amd64 --build-arg VERSION=dev-2.1.0 \ # | docker buildx build --progress=plain \
# --build-arg VERSION=dev-2.1.0 \
# -f obmp-docker/collector/Dockerfile -t openbmp/collector:dev-2.1.0 - # -f obmp-docker/collector/Dockerfile -t openbmp/collector:dev-2.1.0 -
# #
@ -40,13 +44,13 @@ RUN rm -rf build && mkdir -p build && cd build \
FROM debian:bullseye-slim FROM debian:bullseye-slim
# Add files. # Add files.
ADD obmp-docker/collector/scripts/install /tmp/ ADD --chmod=755 obmp-docker/collector/scripts/install /tmp/
ADD obmp-docker/collector/scripts/run /usr/sbin/ ADD --chmod=755 obmp-docker/collector/scripts/run /usr/sbin/
ARG VERSION=0 ARG VERSION=0
# Copy files from previous stages # Copy files from previous stages
COPY --from=build /usr/bin/openbmpd /usr/bin/ COPY --chmod=755 --from=build /usr/bin/openbmpd /usr/bin/
COPY --from=build /usr/etc/openbmp/openbmpd.conf /usr/etc/openbmp/openbmpd.conf COPY --from=build /usr/etc/openbmp/openbmpd.conf /usr/etc/openbmp/openbmpd.conf
COPY --from=build /etc/init/openbmpd.conf /etc/init/openbmpd.conf COPY --from=build /etc/init/openbmpd.conf /etc/init/openbmpd.conf
COPY --from=build /etc/default/openbmpd.new /etc/default/openbmpd COPY --from=build /etc/default/openbmpd.new /etc/default/openbmpd

3
dev-image/Dockerfile
View File

@ -7,8 +7,7 @@
# #
# Author: Tim Evens <tim@openbmp.org> # Author: Tim Evens <tim@openbmp.org>
# #
# BUILD: docker build --platform linux/amd64 -t openbmp/dev-image . # BUILD: docker buildx build --progress=plain -t openbmp/dev-image:latest .
# docker tag openbmp/dev-image openbmp/dev-image:latest
FROM debian:bullseye-slim AS build FROM debian:bullseye-slim AS build

18
psql-app/Dockerfile
View File

@ -1,3 +1,4 @@
# syntax=docker/dockerfile:1.3
# Postgres Backend: openbmp/psql-app # Postgres Backend: openbmp/psql-app
# #
# Copyright (c) 2021-2022 Cisco Systems, Inc. and Tim Evens. All rights reserved. # Copyright (c) 2021-2022 Cisco Systems, Inc. and Tim Evens. All rights reserved.
@ -11,9 +12,12 @@
# Change directories to obmp-docker/psql-app and run the below from that # Change directories to obmp-docker/psql-app and run the below from that
# directory. # directory.
# #
# Use buildkit - either via export DOCKER_BUILDKIT=1 or by using buildx cli
#
# Example docker build: # Example docker build:
# tar -cL -C ../../ ./obmp-psql ./obmp-docker/psql-app ./obmp-java-api-message \ # tar -c -C ../../ ./obmp-psql ./obmp-docker/psql-app ./obmp-java-api-message \
# | docker build --platform linux/amd64 --build-arg VERSION=dev-2.1.0 \ # | docker buildx build --platform linux/amd64 --progress=plain \
# --build-arg VERSION=dev-2.1.0 \
# -f obmp-docker/psql-app/Dockerfile -t openbmp/psql-app:dev-2.1.0 - # -f obmp-docker/psql-app/Dockerfile -t openbmp/psql-app:dev-2.1.0 -
# ----------------------------------------------- # -----------------------------------------------
@ -45,13 +49,13 @@ FROM openjdk:17-slim
# Copy files from previous stages # Copy files from previous stages
COPY --from=build /ws/target/obmp-psql-consumer-0.1.0-SNAPSHOT.jar /usr/local/openbmp/obmp-psql-consumer.jar COPY --from=build /ws/target/obmp-psql-consumer-0.1.0-SNAPSHOT.jar /usr/local/openbmp/obmp-psql-consumer.jar
COPY --from=build /ws/database/ /usr/local/openbmp/database COPY --from=build /ws/database/ /usr/local/openbmp/database
COPY --from=build /ws/cron_scripts/gen-whois/*.py /usr/local/openbmp/ COPY --chmod=755 --from=build /ws/cron_scripts/gen-whois/*.py /usr/local/openbmp/
COPY --from=build /ws/cron_scripts/rpki/*.py /usr/local/openbmp/ COPY --chmod=755 --from=build /ws/cron_scripts/rpki/*.py /usr/local/openbmp/
COPY --from=build /ws/scripts/dbip-to-psql.py /usr/local/openbmp/ COPY --chmod=755 --from=build /ws/scripts/dbip-to-psql.py /usr/local/openbmp/
# Add files # Add files
ADD obmp-docker/psql-app/scripts/run /usr/sbin/ ADD --chmod=755 obmp-docker/psql-app/scripts/run /usr/sbin/
ADD obmp-docker/psql-app/scripts/upgrade_l3vpn.sh /usr/local/openbmp/upgrade_l3vpn.sh ADD --chmod=755 obmp-docker/psql-app/scripts/upgrade_l3vpn.sh /usr/local/openbmp/upgrade_l3vpn.sh
#---------------------------------- #----------------------------------
# Define persistent data volumes # Define persistent data volumes

2
psql-app/scripts/run
View File

@ -165,6 +165,8 @@ MAILTO=""
SETVAR SETVAR
}
# ----------------------------------------------- # -----------------------------------------------
# Upgrade SQL # Upgrade SQL
# ----------------------------------------------- # -----------------------------------------------