Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 61b6250

Browse files
committed
docker: docker build context and dev volume
1 parent 2ebb27a commit 61b6250

File tree

2 files changed

+6
-141
lines changed

2 files changed

+6
-141
lines changed

‎docker/debian-nginx-http-log-json/Dockerfile

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
FROM debian:sid
22

3-
LABEL maintainer "fooinha@gmail.com"
3+
LABEL maintainer = "fooinha@gmail.com"
44

55
# Build arguments
66
ARG DEBIAN_REPO_HOST=httpredir.debian.org
7-
ARG GIT_LOCATION=https://github.com/fooinha/nginx-json-log.git
8-
ARG GIT_BRANCH=master
97

108
# Mirror to my location
119
RUN echo "deb http://${DEBIAN_REPO_HOST}/debian sid main" > /etc/apt/sources.list
@@ -39,7 +37,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --fix-missing \
3937
libgeoip1 \
4038
libgeoip-dev \
4139
libperl-dev \
42-
python \
4340
mercurial \
4441
vim \
4542
bind9-host \
@@ -55,27 +52,24 @@ RUN mkdir -p /build
5552

5653
WORKDIR /build
5754

58-
# Fetches and clones from git location
59-
RUN git clone ${GIT_LOCATION}
60-
RUN cd nginx-json-log && git checkout ${GIT_BRANCH}
61-
6255
# Clone from nginx
6356
RUN hg clone http://hg.nginx.org/nginx
6457

6558
WORKDIR /build/nginx
59+
6660
# Configure , make and install
67-
RUN ./auto/configure --add-module=/build/nginx-json-log --with-debug --with-http_perl_module --with-http_geoip_module --with-mail --with-stream --with-ld-opt="-Wl,-E"
61+
#RUN ./auto/configure --add-module=/build/nginx-json-log --with-debug --with-http_perl_module --with-http_geoip_module --with-mail --with-stream --with-ld-opt="-Wl,-E"
6862

69-
RUN make install
63+
#RUN make install
7064

7165
# Get test framework
7266
RUN git clone https://github.com/openresty/test-nginx.git
7367

7468
# Install test framework and dependencies
75-
RUN cd test-nginx/ && cpanm . && cpanm install JSON
69+
#RUN cd test-nginx/ && cpanm . && cpanm install JSON
7670

7771
# Run exuberant ctags
78-
RUN cd /build/nginx-json-log && ctags -R src/ ../nginx/src/
72+
#RUN cd /build/nginx-json-log && ctags -R src/ ../nginx/src/
7973

8074
# Install files
8175
COPY nginx.conf /usr/local/nginx/conf/nginx.conf

‎docker/docker-compose.yml

Lines changed: 0 additions & 129 deletions
This file was deleted.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /