Skip to content

Commit

Permalink
Fix deprecated style of ini comments and avoid failing alpine builds …
Browse files Browse the repository at this point in the history
…on non errors (#190)

* Fix deprecated comments

* fix package verification build

* readd missing suffix
  • Loading branch information
pawelchcki authored and labbati committed Dec 14, 2018
1 parent 3ceb05f commit c4f9180
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
7 changes: 3 additions & 4 deletions dockerfiles/verify_packages/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CENTOS7_PHP_VERSIONS=56.centos7 70.centos7 71.centos7 72.centos7
CENTOS7_MANUAL_PHP_VERSIONS=71.centos7-compiled
ALPINE_PHP_VERSIONS=5.6.alpine 7.0.alpine 7.1.alpine 7.2.alpine 5.6-zts.alpine 7.0-zts.alpine 7.1-zts.alpine 7.2-zts.alpine

.PHONY: $(JESSIE_PHP_VERSIONS) $(STRETCH_PHP_VERSIONS) $(CENTOS7_PHP_VERSIONS) $(CENTOS7_MANUAL_PHP_VERSIONS) $(ALPINE_PHP_VERSIONS) all
.PHONY: $(JESSIE_PHP_VERSIONS) $(STRETCH_PHP_VERSIONS) $(CENTOS7_PHP_VERSIONS) $(ALPINE_PHP_VERSIONS) $(CENTOS7_MANUAL_PHP_VERSIONS) all

all: $(JESSIE_PHP_VERSIONS) $(CENTOS6_PHP_VERSIONS) $(CENTOS7_PHP_VERSIONS) $(ALPINE_PHP_VERSIONS)

Expand All @@ -23,7 +23,7 @@ $(CENTOS7_PHP_VERSIONS): %.centos7:
@echo Building Centos 7 - PHP $*
@docker build -t centos_7:$* --build-arg php_version=$* -f dockerfiles/verify_packages/centos7/Dockerfile .

$(CENTOS7_MANUAL_PHP_VERSIONS): %.centos7:
$(CENTOS7_MANUAL_PHP_VERSIONS): %.centos7-compiled:
@echo Building Centos 7 - PHP $*
@docker build -t centos_7_compiled:$* -f dockerfiles/verify_packages/centos7-compiled/Dockerfile .

Expand All @@ -36,5 +36,4 @@ $(ALPINE_PHP_VERSIONS): %.alpine:
@test -f dockerfiles/verify_packages/alpine/Dockerfile && rm dockerfiles/verify_packages/alpine/Dockerfile || true
@sed -e "s/%%php_version%%/$*-alpine/g" dockerfiles/verify_packages/alpine/Dockerfile.template > dockerfiles/verify_packages/alpine/Dockerfile
@docker build -t alpine_php:$* -f dockerfiles/verify_packages/alpine/Dockerfile .
@test -f dockerfiles/verify_packages/alpine/Dockerfile && rm dockerfiles/verify_packages/alpine/Dockerfile

@test -f dockerfiles/verify_packages/alpine/Dockerfile && rm dockerfiles/verify_packages/alpine/Dockerfile || true
4 changes: 2 additions & 2 deletions package/post-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ function println(){

function append_configuration_to_file() {
tee -a "$@" <<EOF
## Autogenerated by the DataDog post-install.sh script
; Autogenerated by the DataDog post-install.sh script
[datadog]
extension=${EXTENSION_FILE_PATH}
## end of autogenerated part
; end of autogenerated part
EOF
}

Expand Down

0 comments on commit c4f9180

Please sign in to comment.