diff --git a/code-formatter/Dockerfile b/code-formatter/Dockerfile index 011bf63..a93ce45 100644 --- a/code-formatter/Dockerfile +++ b/code-formatter/Dockerfile @@ -7,14 +7,16 @@ RUN apt-get update && \ # add yarn and php RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ + curl -sS https://packages.sury.org/php/apt.gpg | apt-key add - && \ + echo "deb https://packages.sury.org/php/ stretch main" | tee /etc/apt/sources.list.d/php7.3.list && \ apt-get update && \ - apt-get install -y yarn php7.0-cli && \ + apt-get install -y yarn php7.3-cli && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/* /tmp/* /var/tmp/* # add php fixer -RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.10.0/php-cs-fixer.phar -o /usr/local/bin/php-cs-fixer && \ +RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.14.0/php-cs-fixer.phar -o /usr/local/bin/php-cs-fixer && \ chmod a+x /usr/local/bin/php-cs-fixer WORKDIR /app diff --git a/code-formatter/Dockerfile.56 b/code-formatter/Dockerfile.56 index 1c7a1bb..ce4bc01 100644 --- a/code-formatter/Dockerfile.56 +++ b/code-formatter/Dockerfile.56 @@ -14,7 +14,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ # add php fixer -RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.10.0/php-cs-fixer.phar -o /usr/local/bin/php-cs-fixer && \ +RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.14.0/php-cs-fixer.phar -o /usr/local/bin/php-cs-fixer && \ chmod a+x /usr/local/bin/php-cs-fixer WORKDIR /app diff --git a/code-formatter/Makefile b/code-formatter/Makefile index ee057df..084509a 100644 --- a/code-formatter/Makefile +++ b/code-formatter/Makefile @@ -17,17 +17,19 @@ GIT_TAG = $(shell git describe --tags --exact-match 2>/dev/null) VERSION := $(or $(GIT_TAG),latest) -all : VERSION := 1.0.3 +all : VERSION := 1.0.4 all : build release .PHONY : all build : - docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.0 . + docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.3 . docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php5.6 . - docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.0 $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION) + docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.3 $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION) + docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.3 $(DOCKER_REGISTRY)/$(APP_NAME):latest release : build - docker push $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.0 + docker push $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.3 docker push $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php5.6 docker push $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION) + docker push $(DOCKER_REGISTRY)/$(APP_NAME):latest