Skip to content

Commit db064e8

Browse files
ajmu1ajmu1
committed
Enabling podman for make targets
1 parent 167a061 commit db064e8

3 files changed

Lines changed: 3 additions & 34 deletions

File tree

‎Makefile‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,6 @@ include $(abspath $(PROJECT_DIR)/build/automation/init.mk)
44
# ==============================================================================
55
# Development workflow targets
66

7-
docker-cmd:
8-
DOCKER_CMD=$(DOCKER_CMD)
9-
10-
docker-debugger:
11-
DOCKER_LIB_IMAGE_DIR=$(DOCKER_LIB_IMAGE_DIR)
12-
13-
# docker_get_reg:
14-
# echo $(_docker-get-reg)
15-
16-
# build_ts:
17-
# echo $(or $(BUILD_DATE), $(shell date -u +"%Y-%m-%dT%H:%M:%S%z"))
18-
# echo $(shell date -j -f "%Y-%m-%dT%H:%M:%S%z" "$(BUILD_DATE)" -u +"%Y%m%d%H%M%S" 2>/dev/null)
19-
207
setup: project-config # Set up project
218
make tester-build
229

‎build/automation/init.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ GIT_COMMIT_MESSAGE_MAX_LENGTH := 72
617617
GIT_PULL_REQUEST_TITLE_MAX_LENGTH := $(shell echo $$(( $(GIT_COMMIT_MESSAGE_MAX_LENGTH) + 12 )))
618618

619619
BUILD_DATE := $(or $(BUILD_DATE), $(shell date -u +"%Y-%m-%dT%H:%M:%S%z"))
620-
BUILD_TIMESTAMP := $(shell gdate --date=$(BUILD_DATE) -u +"%Y%m%d%H%M%S" 2> /dev/null)
620+
BUILD_TIMESTAMP := $(shell date --date=$(BUILD_DATE) -u +"%Y%m%d%H%M%S" 2> /dev/null)
621621
BUILD_ID := $(or $(or $(or $(or $(shell ([ -z "$(BUILD_ID)" ] && [ -n "$(JENKINS_URL)" ]) && echo $(BUILD_TIMESTAMP) ||:), $(BUILD_ID)), $(CIRCLE_BUILD_NUM)), $(CODEBUILD_BUILD_NUMBER)), 0)
622622
BUILD_REPO := $(or $(shell git config --get remote.origin.url 2> /dev/null ||:), unknown)
623623
BUILD_BRANCH := $(if $(shell git rev-parse --abbrev-ref HEAD 2> /dev/null | grep -E ^HEAD$ ||:),$(or $(shell git name-rev --name-only HEAD 2> /dev/null | sed "s;remotes/origin/;;g" ||:), unknown),$(or $(shell git rev-parse --abbrev-ref HEAD 2> /dev/null | sed "s;remotes/origin/;;g" ||:), unknown))

‎build/automation/lib/docker.mk‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -74,28 +74,23 @@ docker-build docker-image: ### Build Docker image - mandatory: NAME; optional: V
7474
reg=$$(make _docker-get-reg)
7575
# Try to execute `make build` from the image directory
7676
if [ -d $(DOCKER_LIB_IMAGE_DIR)/$(NAME) ] && [ -z "$(__DOCKER_BUILD)" ]; then
77-
echo "00------------------------------------------------------------------"
7877
cd $(DOCKER_LIB_IMAGE_DIR)/$(NAME)
7978
make build __DOCKER_BUILD=true DOCKER_REGISTRY=$(DOCKER_LIBRARY_REGISTRY)
8079
exit
8180
elif [ -d $(DOCKER_CUSTOM_DIR)/$(NAME) ] && [ -z "$(__DOCKER_BUILD)" ]; then
82-
echo "01------------------------------------------------------------------"
8381
cd $(DOCKER_CUSTOM_DIR)/$(NAME)
8482
make build __DOCKER_BUILD=true && exit || cd $(PROJECT_DIR)
8583
elif [ -d $(DOCKER_DIR)/$(NAME) ] && [ -z "$(__DOCKER_BUILD)" ]; then
86-
echo "02------------------------------------------------------------------"
8784
cd $(DOCKER_DIR)/$(NAME)
8885
make build __DOCKER_BUILD=true && exit || cd $(PROJECT_DIR)
8986
elif [ -d $(DOCKER_DIR)/$(GENERIC_IMAGE_NAME) ] && [ -z "$(__DOCKER_BUILD)" ]; then
90-
echo "03------------------------------------------------------------------"
9187
cd $(DOCKER_DIR)/$(GENERIC_IMAGE_NAME)
9288
make build __DOCKER_BUILD=true && exit || cd $(PROJECT_DIR)
9389
fi
9490
# Dockerfile
9591
make NAME=$(NAME) \
9692
docker-create-dockerfile FILE=Dockerfile$(shell [ -n "$(EXAMPLE)" ] && echo .example) \
9793
docker-image-set-version VERSION=$(VERSION)
98-
echo "VERSION----------------------------------------------$(VERSION)"
9994
# Cache
10095
cache_from=
10196
if [[ "$(FROM_CACHE)" =~ ^(true|yes|y|on|1|TRUE|YES|Y|ON)$$ ]]; then
@@ -106,7 +101,6 @@ docker-build docker-image: ### Build Docker image - mandatory: NAME; optional: V
106101
dir=$$(make _docker-get-dir)
107102
export IMAGE=$$reg/$(NAME)$(shell [ -n "$(EXAMPLE)" ] && echo -example)
108103
export VERSION=$$(make docker-image-get-version)
109-
echo "$$(make docker-image-get-version)--------------------------"
110104
make -s file-replace-variables FILE=$$dir/Dockerfile.effective
111105
$(DOCKER_CMD) buildx build --rm \
112106
--build-arg IMAGE=$$IMAGE \
@@ -162,15 +156,11 @@ docker-create-repository: ### Create Docker repository to store an image - manda
162156
docker-push: ### Push Docker image - mandatory: NAME; optional: VERSION|TAG
163157
make docker-login
164158
reg=$$(make _docker-get-reg)
165-
echo "0 -----------------------------------------------------------------$(NAME) or $(VERSION) or $(TAG)"
166159
if [ -n "$(or $(VERSION), $(TAG))" ]; then
167-
echo "1 -----------------------------------------------------------------$(NAME) or $(VERSION) or $(TAG)"
168160
$(DOCKER_CMD) push $$reg/$(NAME):$(or $(VERSION), $(TAG))
169161
else
170-
echo "2 -----------------------------------------------------------------$(NAME) $$(make docker-image-get-version)"
171162
$(DOCKER_CMD) push $$reg/$(NAME):$$(make docker-image-get-version)
172163
fi
173-
echo "3 -----------------------------------------------------------------$(NAME)"
174164
$(DOCKER_CMD) push $$reg/$(NAME):latest 2> /dev/null ||:
175165

176166
docker-push-for-production: ### Push Docker image - mandatory: NAME; optional: VERSION|TAG
@@ -194,17 +184,14 @@ docker-pull: ### Pull Docker image - mandatory: NAME,DIGEST|VERSION|TAG
194184
docker-tag: ### Tag latest or provide arguments - mandatory: NAME,VERSION|TAG|[SOURCE,TARGET]|[DIGEST,VERSION|TAG]
195185
reg=$$(make _docker-get-reg)
196186
if [ -n "$(DIGEST)" ] && [ -n "$(TAG)" ]; then
197-
echo "0_____________________________$(DIGEST), $(NAME), $(VERSION), $(TAG)"
198187
$(DOCKER_CMD) tag \
199188
$$reg/$(NAME)@$(DIGEST) \
200189
$$reg/$(NAME):$(or $(VERSION), $(TAG))
201190
elif [ -n "$(SOURCE)" ] && [ -n "$(TARGET)" ]; then
202-
echo "1_____________________________$(SOURCE), $(TARGET) "
203191
$(DOCKER_CMD) tag \
204192
$$reg/$(NAME):$(SOURCE) \
205193
$$reg/$(NAME):$(TARGET)
206194
elif [ -n "$(or $(VERSION), $(TAG))" ]; then
207-
echo "2_____________________________$(NAME), $(VERSION), $(TAG)"
208195
$(DOCKER_CMD) tag \
209196
$$reg/$(NAME):latest \
210197
$$reg/$(NAME):$(or $(VERSION), $(TAG))
@@ -270,18 +257,14 @@ docker-image-get-version: ### Get effective Docker image version - mandatory: NA
270257
cat $$dir/.version 2> /dev/null || cat $$dir/VERSION 2> /dev/null || echo unknown
271258

272259
docker-image-set-version: ### Set effective Docker image version - mandatory: NAME; optional: VERSION
273-
echo "-----------------printing variables to get the .version file location $(DOCKER_LIB_IMAGE_DIR), $(NAME), $(DOCKER_CUSTOM_DIR), $(VERSION)"
274260
if [ -d $(DOCKER_LIB_IMAGE_DIR)/$(NAME) ] && [ -z "$(DOCKER_CUSTOM_DIR)" ]; then
275-
echo "000---------------------------Inside set image version if $(DOCKER_LIB_IMAGE_DIR)/$(NAME)/.version"
276261
rm -f $(DOCKER_LIB_IMAGE_DIR)/$(NAME)/.version
277262
exit
278263
fi
279264
dir=$$(make _docker-get-dir)
280265
if [ -n "$(VERSION)" ]; then
281-
echo "001---------------------------Inside set image version if $(VERSION), $$(make _docker-get-dir)"
282266
echo $(VERSION) > $$dir/.version
283267
else
284-
echo "002---------------------------Inside set image version else $$(cat $$dir/VERSION)"
285268
echo $$(cat $$dir/VERSION) | \
286269
sed "s/YYYY/$$(date --date=$(BUILD_DATE) -u +"%Y")/g" | \
287270
sed "s/mm/$$(date --date=$(BUILD_DATE) -u +"%m")/g" | \
@@ -292,7 +275,6 @@ docker-image-set-version: ### Set effective Docker image version - mandatory: NA
292275
sed "s/SS/$$(date --date=$(BUILD_DATE) -u +"%S")/g" | \
293276
sed "s/hash/$$(git rev-parse --short HEAD)/g" \
294277
> $$dir/.version
295-
echo "-------------------------------------dir/.version = $$(cat $$dir/.version)"
296278
fi
297279

298280
# ==============================================================================
@@ -551,7 +533,7 @@ docker-run-python: ### Run python container - mandatory: CMD; optional: SH=true,
551533
image=$$([ -n "$(IMAGE)" ] && echo $(IMAGE) || echo python:$(DOCKER_PYTHON_VERSION))
552534
container=$$([ -n "$(CONTAINER)" ] && echo $(CONTAINER) || echo python-$(BUILD_COMMIT_HASH)-$(BUILD_ID)-$$(date --date=$$(date -u +"%Y-%m-%dT%H:%M:%S%z") -u +"%Y%m%d%H%M%S" 2> /dev/null)-$$(make secret-random LENGTH=8))
553535
if [[ ! "$(SH)" =~ ^(true|yes|y|on|1|TRUE|YES|Y|ON)$$ ]]; then
554-
docker run --interactive $(_TTY) --rm \
536+
$(DOCKER_CMD) run --interactive $(_TTY) --rm \
555537
--name $$container \
556538
--user $$(id -u):$$(id -g) \
557539
--env-file <(make _list-variables PATTERN="^(AWS|TX|TEXAS|NHSD|TERRAFORM)") \
@@ -569,7 +551,7 @@ docker-run-python: ### Run python container - mandatory: CMD; optional: SH=true,
569551
$$image \
570552
$(CMD)
571553
else
572-
docker run --interactive $(_TTY) --rm \
554+
$(DOCKER_CMD) run --interactive $(_TTY) --rm \
573555
--name $$container \
574556
--user $$(id -u):$$(id -g) \
575557
--env-file <(make _list-variables PATTERN="^(AWS|TX|TEXAS|NHSD|TERRAFORM)") \

0 commit comments

Comments
 (0)