Skip to content
Snippets Groups Projects
Commit c84168e8 authored by Erick Hitter's avatar Erick Hitter
Browse files

Merge branch 'develop' into 'master'

PHP: add git to all images; Go: update golint path

See merge request !10
parents 08d69f9b b298dbd6
No related branches found
No related tags found
1 merge request!10PHP: add git to all images; Go: update golint path
Pipeline #751 passed with stages
in 6 minutes and 5 seconds
...@@ -7,7 +7,7 @@ LABEL version="1.0" ...@@ -7,7 +7,7 @@ LABEL version="1.0"
# Install golint # Install golint
ENV GOPATH /go ENV GOPATH /go
ENV PATH ${GOPATH}/bin:$PATH ENV PATH ${GOPATH}/bin:$PATH
RUN go get -u github.com/golang/lint/golint RUN go get -u golang.org/x/lint/golint
# Add apt key for LLVM repository # Add apt key for LLVM repository
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
......
...@@ -4,7 +4,7 @@ LABEL maintainer="ethitter" ...@@ -4,7 +4,7 @@ LABEL maintainer="ethitter"
LABEL version="1.0" LABEL version="1.0"
RUN apt-get update \ RUN apt-get update \
&& apt-get -yqqf install lsb-release zip unzip subversion mysql-client libicu-dev libpng-dev libbz2-dev libmysqlclient-dev libfreetype6-dev libjpeg-dev libxpm-dev --fix-missing --no-install-recommends \ && apt-get -yqqf install lsb-release zip unzip subversion git mysql-client libicu-dev libpng-dev libbz2-dev libmysqlclient-dev libfreetype6-dev libjpeg-dev libxpm-dev --fix-missing --no-install-recommends \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
......
...@@ -4,7 +4,7 @@ LABEL maintainer="ethitter" ...@@ -4,7 +4,7 @@ LABEL maintainer="ethitter"
LABEL version="1.0" LABEL version="1.0"
RUN apt-get update \ RUN apt-get update \
&& apt-get -yqqf install lsb-release zip unzip subversion mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \ && apt-get -yqqf install lsb-release zip unzip subversion git mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
......
...@@ -4,7 +4,7 @@ LABEL maintainer="ethitter" ...@@ -4,7 +4,7 @@ LABEL maintainer="ethitter"
LABEL version="1.0" LABEL version="1.0"
RUN apt-get update \ RUN apt-get update \
&& apt-get -yqqf install lsb-release zip unzip subversion mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \ && apt-get -yqqf install lsb-release zip unzip subversion git mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
......
...@@ -4,7 +4,7 @@ LABEL maintainer="ethitter" ...@@ -4,7 +4,7 @@ LABEL maintainer="ethitter"
LABEL version="1.0" LABEL version="1.0"
RUN apt-get update \ RUN apt-get update \
&& apt-get -yqqf install lsb-release zip unzip subversion mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \ && apt-get -yqqf install lsb-release zip unzip subversion git mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
......
...@@ -4,7 +4,7 @@ LABEL maintainer="ethitter" ...@@ -4,7 +4,7 @@ LABEL maintainer="ethitter"
LABEL version="1.0" LABEL version="1.0"
RUN apt-get update \ RUN apt-get update \
&& apt-get -yqqf install lsb-release zip unzip subversion mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \ && apt-get -yqqf install lsb-release zip unzip subversion git mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
......
...@@ -4,7 +4,7 @@ LABEL maintainer="ethitter" ...@@ -4,7 +4,7 @@ LABEL maintainer="ethitter"
LABEL version="1.0" LABEL version="1.0"
RUN apt-get update \ RUN apt-get update \
&& apt-get -yqqf install lsb-release zip unzip subversion mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev libzip-dev --fix-missing --no-install-recommends \ && apt-get -yqqf install lsb-release zip unzip subversion git mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev libzip-dev --fix-missing --no-install-recommends \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment