Adjust Makefile according to changes in previous commits
TODO: Make encryption of any file easier. Decryption is taken care of for all files with .age extension
This commit is contained in:
@@ -22,9 +22,8 @@ init:
|
||||
@echo "### Init..."
|
||||
@./require ${DOT_ENV_FILE} alpine_source
|
||||
@./require ${DOT_ENV_FILE} tailspin_bin
|
||||
@./require ${DOT_ENV_FILE} age_bin
|
||||
@echo "### Init done"
|
||||
-@make vault/decrypt
|
||||
@make vault/decrypt
|
||||
|
||||
build: repository
|
||||
@echo "### Assembling..."
|
||||
@@ -41,17 +40,16 @@ build: repository
|
||||
@./src/esh -o ${DIST_DIR}/hotspot.conf src/hotspot.conf ${DOT_ENV_PAIRS}
|
||||
@./src/esh -o ${DIST_DIR}/wg0.conf src/wg0.conf ${DOT_ENV_PAIRS}
|
||||
@cp secrets/*.psk ${DIST_DIR}
|
||||
@cp src/authorized_keys ${DIST_DIR}
|
||||
@cp secrets/authorized_keys ${DIST_DIR}
|
||||
@cp src/config.toml ${DIST_DIR}
|
||||
@cp src/logpattern.conf ${DIST_DIR}
|
||||
@cp src/main.conf ${DIST_DIR}
|
||||
@cp src/rsyslog.conf ${DIST_DIR}
|
||||
@cp src/usercfg.txt ${DIST_DIR}
|
||||
@cp src/watchdog.sh ${DIST_DIR}
|
||||
@cp src/repository-builder/packager.rsa.pub ${DIST_DIR}
|
||||
@cp secrets/packager.rsa.pub ${DIST_DIR}
|
||||
@cp src/repository-builder/${REQUIREMENTS_FILE} ${DIST_DIR}
|
||||
@echo "### Assembling done"
|
||||
@make vault/encrypt
|
||||
|
||||
card: clean build
|
||||
@echo "### Copying to sdcard..."
|
||||
@@ -96,8 +94,8 @@ repository: repository-builder
|
||||
-e BUILDER_KEY_BASENAME=${BUILDER_KEY_BASENAME} \
|
||||
-e BUILDER_UID=${BUILDER_UID} \
|
||||
-e BUILDER_GID=${BUILDER_GID} \
|
||||
-v $(PWD)/src/repository-builder/packager.rsa:/root/.abuild/packager.rsa \
|
||||
-v $(PWD)/src/repository-builder/packager.rsa.pub:/root/.abuild/packager.rsa.pub \
|
||||
-v $(PWD)/secrets/packager.rsa:/root/.abuild/packager.rsa \
|
||||
-v $(PWD)/secrets/packager.rsa.pub:/root/.abuild/packager.rsa.pub \
|
||||
-v $(PWD)/src/repository-builder/abuild.conf:/root/.abuild/abuild.conf \
|
||||
-v ${CACHE_DIR}/aport:/mirror \
|
||||
${BUILDER_DOCKER_IMAGE} build-repository \
|
||||
|
||||
Reference in New Issue
Block a user