From 8c08a13c231f4f762fd2e939e675211bc1ad7fa8 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Thu, 16 Jan 2025 11:33:18 -0800 Subject: [PATCH] Remove make load --- Makefile.eif | 13 ++----------- scripts/aws/Dockerfile | 1 - 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Makefile.eif b/Makefile.eif index fd3f8babb..e6c659bc3 100644 --- a/Makefile.eif +++ b/Makefile.eif @@ -13,23 +13,14 @@ all: build_eif build_eif: uid2operator.eif euidoperator.eif -uid2operator.eif: build_artifacts build_configs build/proxies.nitro.yaml build/syslog-ng-client.conf build/syslog-ng-core_4.6.0-1_amd64.deb build/syslog-ng-ose-pub.asc build/entrypoint.sh build/vsockpx build/Dockerfile build/load_config.py build/make_config.py +uid2operator.eif: build_artifacts build_configs build/proxies.nitro.yaml build/syslog-ng-client.conf build/syslog-ng-core_4.6.0-1_amd64.deb build/syslog-ng-ose-pub.asc build/entrypoint.sh build/vsockpx build/Dockerfile cd build; docker build -t uid2operator . --build-arg JAR_VERSION=`cat package.version` --build-arg IMAGE_VERSION=`cat package.version`-`git show --format="%h" --no-patch`; docker save -o ./uid2operator.tar uid2operator; docker cp ./uid2operator.tar amazonlinux:/uid2operator.tar; rm -f ./uid2operator.tar docker exec amazonlinux bash aws_nitro_eif.sh uid2operator -euidoperator.eif: build_artifacts build_configs build/proxies.nitro.yaml build/syslog-ng-client.conf build/syslog-ng-core_4.6.0-1_amd64.deb build/syslog-ng-ose-pub.asc build/entrypoint.sh build/vsockpx build/Dockerfile build/load_config.py build/make_config.py +euidoperator.eif: build_artifacts build_configs build/proxies.nitro.yaml build/syslog-ng-client.conf build/syslog-ng-core_4.6.0-1_amd64.deb build/syslog-ng-ose-pub.asc build/entrypoint.sh build/vsockpx build/Dockerfile cd build; docker build -t euidoperator . --build-arg IDENTITY_SCOPE='EUID' --build-arg JAR_VERSION=`cat package.version` --build-arg IMAGE_VERSION=`cat package.version`-`git show --format="%h" --no-patch`; docker save -o ./euidoperator.tar euidoperator; docker cp ./euidoperator.tar amazonlinux:/euidoperator.tar; rm -f ./euidoperator.tar docker exec amazonlinux bash aws_nitro_eif.sh euidoperator -################################################################################################################################################################## - -# Config scripts - -build/load_config.py: ./scripts/aws/load_config.py - cp ./scripts/aws/load_config.py ./build/ - -build/make_config.py: ./scripts/aws/make_config.py - cp ./scripts/aws/make_config.py ./build/ ################################################################################################################################################################## diff --git a/scripts/aws/Dockerfile b/scripts/aws/Dockerfile index 2c6baf89e..b016a98e4 100644 --- a/scripts/aws/Dockerfile +++ b/scripts/aws/Dockerfile @@ -31,7 +31,6 @@ COPY ./target/${JAR_NAME}-${JAR_VERSION}-jar-with-dependencies.jar /app/${JAR_NA COPY ./static /app/static COPY ./libjnsm.so /app/lib/ COPY ./vsockpx /app/ -COPY ./make_config.py /app/ COPY ./entrypoint.sh /app/ COPY ./proxies.nitro.yaml /app/ COPY ./conf/default-config.json /app/conf/