supports alpine v3.11

smellman · smellman · commit 80af2955a8f1 · 2020-01-07T17:06:29.000+09:00
diff --git a/12-3/alpine/Dockerfile b/12-3/alpine/Dockerfile
@@ -23,19 +23,18 @@ RUN set -ex \
     && apk add --no-cache --virtual .build-deps \
         autoconf \
         automake \
+        file \
         json-c-dev \
         libtool \
         libxml2-dev \
         make \
         perl \
-    \
-    && apk add --no-cache --virtual .build-deps-edge \
-        --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
-        --repository http://dl-cdn.alpinelinux.org/alpine/edge/main \
+        clang-dev \
         g++ \
         gcc \
         gdal-dev \
         geos-dev \
+        llvm9-dev \
         proj-dev \
         protobuf-c-dev \
     && cd /usr/src/postgis \
@@ -48,17 +47,14 @@ RUN set -ex \
     && make install \
     && apk add --no-cache --virtual .postgis-rundeps \
         json-c \
-    && apk add --no-cache --virtual .postgis-rundeps-edge \
-        --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
-        --repository http://dl-cdn.alpinelinux.org/alpine/edge/main \
         geos \
         gdal \
         proj \
         libstdc++ \
         protobuf-c \
     && cd / \
     && rm -rf /usr/src/postgis \
-    && apk del .fetch-deps .build-deps .build-deps-edge
+    && apk del .fetch-deps .build-deps
 
 COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/postgis.sh
 COPY ./update-postgis.sh /usr/local/bin

Original file line number	Original file line	Diff line number	Diff line change
`@@ -23,19 +23,18 @@ RUN set -ex \`
`23`	`&& apk add --no-cache --virtual .build-deps \`	`23`	`&& apk add --no-cache --virtual .build-deps \`
`24`	`autoconf \`	`24`	`autoconf \`
`25`	`automake \`	`25`	`automake \`
		`26`	`+ file \`
`26`	`json-c-dev \`	`27`	`json-c-dev \`
`27`	`libtool \`	`28`	`libtool \`
`28`	`libxml2-dev \`	`29`	`libxml2-dev \`
`29`	`make \`	`30`	`make \`
`30`	`perl \`	`31`	`perl \`
`31`	`- \`	`32`	`+ clang-dev \`
`32`	`- && apk add --no-cache --virtual .build-deps-edge \`
`33`	`- --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \`
`34`	`- --repository http://dl-cdn.alpinelinux.org/alpine/edge/main \`
`35`	`g++ \`	`33`	`g++ \`
`36`	`gcc \`	`34`	`gcc \`
`37`	`gdal-dev \`	`35`	`gdal-dev \`
`38`	`geos-dev \`	`36`	`geos-dev \`
		`37`	`+ llvm9-dev \`
`39`	`proj-dev \`	`38`	`proj-dev \`
`40`	`protobuf-c-dev \`	`39`	`protobuf-c-dev \`
`41`	`&& cd /usr/src/postgis \`	`40`	`&& cd /usr/src/postgis \`
`@@ -48,17 +47,14 @@ RUN set -ex \`
`48`	`&& make install \`	`47`	`&& make install \`
`49`	`&& apk add --no-cache --virtual .postgis-rundeps \`	`48`	`&& apk add --no-cache --virtual .postgis-rundeps \`
`50`	`json-c \`	`49`	`json-c \`
`51`	`- && apk add --no-cache --virtual .postgis-rundeps-edge \`
`52`	`- --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \`
`53`	`- --repository http://dl-cdn.alpinelinux.org/alpine/edge/main \`
`54`	`geos \`	`50`	`geos \`
`55`	`gdal \`	`51`	`gdal \`
`56`	`proj \`	`52`	`proj \`
`57`	`libstdc++ \`	`53`	`libstdc++ \`
`58`	`protobuf-c \`	`54`	`protobuf-c \`
`59`	`&& cd / \`	`55`	`&& cd / \`
`60`	`&& rm -rf /usr/src/postgis \`	`56`	`&& rm -rf /usr/src/postgis \`
`61`	`- && apk del .fetch-deps .build-deps .build-deps-edge`	`57`	`+ && apk del .fetch-deps .build-deps`
`62`		`58`
`63`	`COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/postgis.sh`	`59`	`COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/postgis.sh`
`64`	`COPY ./update-postgis.sh /usr/local/bin`	`60`	`COPY ./update-postgis.sh /usr/local/bin`