Skip to content

Commit

Permalink
Makefile, Dockerfile: post-release clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
fstab50 committed Sep 10, 2019
1 parent 9bfbc55 commit 5778125
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ buildrpm: clean ## Build Redhat distribution (.rpm) os package
@echo "Building RPM package format of $(PROJECT)"; \
if [ ! -f $(VENV_DIR) ]; then $(MAKE) setup-venv; fi; \
if [ $(VERSION) ]; then cd $(CUR_DIR) && . $(VENV_DIR)/bin/activate && \
$(PYTHON3_PATH) $(SCRIPT_DIR)/buildrpm.py --debug --build --set-version $(VERSION); else \
$(PYTHON3_PATH) $(SCRIPT_DIR)/buildrpm.py --build --set-version $(VERSION); else \
cd $(CUR_DIR) && . $(VENV_DIR)/bin/activate && $(PYTHON3_PATH) $(SCRIPT_DIR)/buildrpm.py --build; fi


Expand Down
3 changes: 0 additions & 3 deletions packaging/docker/centos7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ RUN chown -R builder:builder /home/builder
# environment variables
ENV CONTAINER=rpmbuild OS=centos DIST=el7

# run as logins as builder
CMD ["su", "-", "builder", "-c", "/bin/bash"]

##

# end rpm build Dockerfile

0 comments on commit 5778125

Please sign in to comment.