remove useless conf
This commit is contained in:
parent
2e6680d3c2
commit
921d5d53d2
|
|
@ -0,0 +1,38 @@
|
|||
FROM xataz/nginx-php
|
||||
|
||||
ENV UID=991 \
|
||||
GID=991 \
|
||||
PUBLIC_URL=app.presentator.io \
|
||||
API_URI=api.presentator.io \
|
||||
SALT=1234 \
|
||||
API_SALT=1234 \
|
||||
RECAPTCHA_KEY=1234 \
|
||||
RECAPTCHA_SECRET=1234 \
|
||||
NOREPLY_MAIL=no-reply@exemple.tld \
|
||||
SUPPORT_MAIL=support@exemple.tld \
|
||||
DB_HOST=localhost \
|
||||
DB_NAME=presentator \
|
||||
DB_USERNAME=presentator \
|
||||
DB_PASSWORD=1234 \
|
||||
SMTP_HOST=smtp.exemple.tld \
|
||||
SMTP_USERNAME=no-reply@exemple.tld \
|
||||
SMTP_PASSWORD=14234 \
|
||||
SMTP_PORT=465 \
|
||||
SMTP_SSL=ssl
|
||||
|
||||
RUN apk add -U git \
|
||||
&& curl -sS https://getcomposer.org/installer | php -- --filename=composer --install-dir=/usr/local/bin \
|
||||
&& cd / && git clone https://github.com/ganigeorgiev/presentator.git \
|
||||
&& cd /presentator \
|
||||
&& composer global require "fxp/composer-asset-plugin:^1.3.1" \
|
||||
&& composer install \
|
||||
&& php /presentator/init --env=Production --overwrite=n \
|
||||
&& apk del git \
|
||||
&& rm -rf /tmp/* /var/cache/apk/* /usr/src/* \
|
||||
&& rm -rf /presentator/.git/
|
||||
|
||||
COPY rootfs/ /
|
||||
|
||||
RUN chmod +x /usr/local/bin/startup
|
||||
|
||||
VOLUME /presentator/app/web/assets /presentator/app/web/uploads /presentator/app/runtime /presentator/api/runtime
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
FROM xataz/nginx-php
|
||||
|
||||
ENV UID=991 \
|
||||
GID=991 \
|
||||
PUBLIC_URL=app.presentator.io \
|
||||
API_URI=api.presentator.io \
|
||||
SALT=1234 \
|
||||
API_SALT=1234 \
|
||||
RECAPTCHA_KEY=1234 \
|
||||
RECAPTCHA_SECRET=1234 \
|
||||
NOREPLY_MAIL=no-reply@exemple.tld \
|
||||
SUPPORT_MAIL=support@exemple.tld \
|
||||
DB_HOST=localhost \
|
||||
DB_NAME=presentator \
|
||||
DB_USERNAME=presentator \
|
||||
DB_PASSWORD=1234 \
|
||||
SMTP_HOST=smtp.exemple.tld \
|
||||
SMTP_USERNAME=no-reply@exemple.tld \
|
||||
SMTP_PASSWORD=14234 \
|
||||
SMTP_PORT=465 \
|
||||
SMTP_SSL=ssl
|
||||
|
||||
RUN apk add -U wget tar \
|
||||
&& curl -sS https://getcomposer.org/installer | php -- --filename=composer --install-dir=/usr/local/bin \
|
||||
&& cd /tmp/ \
|
||||
&& wget https://github.com/ganigeorgiev/presentator/archive/v1.0.0.tar.gz \
|
||||
&& tar -xvf v1.0.0.tar.gz \
|
||||
&& mkdir /presentator \
|
||||
&& mv presentator-1.0.0/* /presentator \
|
||||
&& cd /presentator \
|
||||
&& composer global require "fxp/composer-asset-plugin:^1.3.1" \
|
||||
&& composer install \
|
||||
&& php /presentator/init --env=Production --overwrite=n \
|
||||
&& apk del git \
|
||||
&& rm -rf /tmp/* /var/cache/apk/* /usr/src/* \
|
||||
&& rm -rf /presentator/.git/
|
||||
|
||||
COPY rootfs/ /
|
||||
|
||||
RUN chmod +x /usr/local/bin/startup
|
||||
|
||||
VOLUME /presentator/app/web/assets /presentator/app/web/uploads /presentator/app/runtime /presentator/api/runtime
|
||||
|
|
@ -7,21 +7,21 @@ server {
|
|||
root /presentator/api/web;
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ @handler;
|
||||
try_files $uri $uri @handler;
|
||||
expires 30d;
|
||||
root /presentator/app/web;
|
||||
index index.html index.htm index.php;
|
||||
}
|
||||
|
||||
location /[.*] {
|
||||
try_files $uri $uri/ @handler;
|
||||
try_files $uri $uri @handler;
|
||||
expires 30d;
|
||||
root /presentator/app/web;
|
||||
index index.html index.htm index.php;
|
||||
}
|
||||
|
||||
location @handler {
|
||||
rewrite ^ /index.php?/$request_uri;
|
||||
rewrite ^ /index.php?$request_uri;
|
||||
}
|
||||
|
||||
location ~ \.php$ {
|
||||
|
|
|
|||
|
|
@ -7,21 +7,21 @@ server {
|
|||
root /presentator/app/web;
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ @handler;
|
||||
try_files $uri $uri @handler;
|
||||
expires 30d;
|
||||
root /presentator/app/web;
|
||||
index index.html index.htm index.php;
|
||||
}
|
||||
|
||||
location /[.*] {
|
||||
try_files $uri $uri/ @handler;
|
||||
try_files $uri $uri @handler;
|
||||
expires 30d;
|
||||
root /presentator/app/web;
|
||||
index index.html index.htm index.php;
|
||||
}
|
||||
|
||||
location @handler {
|
||||
rewrite ^ /index.php?/$request_uri;
|
||||
rewrite ^ /index.php?$request_uri;
|
||||
}
|
||||
|
||||
location ~ \.php$ {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
FROM alpine:3.6
|
||||
|
||||
ARG RETHINKDB_VERSION=2.3.5
|
||||
|
||||
RUN apk -U update \
|
||||
&& apk -U add -ti build-deps \
|
||||
build-base \
|
||||
gnupg \
|
||||
tar \
|
||||
automake \
|
||||
autoconf \
|
||||
binutils \
|
||||
&& apk -U add libcurl \
|
||||
libressl \
|
||||
python \
|
||||
boost \
|
||||
ncurses \
|
||||
jemalloc \
|
||||
protobuf \
|
||||
wget \
|
||||
&& cd /tmp \
|
||||
&& wget https://download.rethinkdb.com/dist/rethinkdb-$RETHINKDB_VERSION.tgz \
|
||||
&& tar xf rethinkdb-$RETHINKDB_VERSION.tgz \
|
||||
&& cd rethinkdb-$RETHINKDB_VERSION \
|
||||
&& ./configure --allow-fetch \
|
||||
&& make
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
Sending build context to Docker daemon 3.072kB
|
||||
Error response from daemon: Dockerfile parse error line 7: Unknown instruction: GCC
|
||||
Sending build context to Docker daemon 3.584kB
|
||||
Error response from daemon: Dockerfile parse error line 7: Unknown instruction: G++
|
||||
Sending build context to Docker daemon 3.584kB
|
||||
Error response from daemon: Dockerfile parse error line 26: Unknown instruction: &&
|
||||
Sending build context to Docker daemon 3.584kB
|
||||
Step 1/3 : FROM alpine/3.6
|
||||
repository alpine/3.6 not found: does not exist or no pull access
|
||||
Sending build context to Docker daemon 4.096kB
|
||||
Step 1/3 : FROM alpine:3.6
|
||||
3.6: Pulling from library/alpine
|
||||
88286f41530e: Already exists
|
||||
Digest: sha256:1072e499f3f655a032e88542330cf75b02e7bdf673278f701d7ba61629ee3ebe
|
||||
Status: Downloaded newer image for alpine:3.6
|
||||
---> 7328f6f8b418
|
||||
Step 2/3 : ARG RETHINKDB_VERSION=2.3.5
|
||||
---> Running in 97da8247d028
|
||||
---> fd041dd46b3e
|
||||
Sending build context to Docker daemon 4.096kB
|
||||
Step 1/3 : FROM alpine:3.6
|
||||
---> 7328f6f8b418
|
||||
Step 2/3 : ARG RETHINKDB_VERSION=2.3.5
|
||||
---> Using cache
|
||||
---> fd041dd46b3e
|
||||
Step 3/3 : RUN apk -U update && apk -U add -ti build-deps build-base gnupg tar automake autoconf binutils && apk -U add libcurl libressl python boost ncurses jemalloc protobuf wget && cd /tmp && wget https://download.rethinkdb.com/dist/rethinkdb-$RETHINKDB_VERSION.tgz && tar xf rethinkdb-$RETHINKDB_VERSION.tgz && cd rethinkdb-$RETHINKDB_VERSION && ./configure --allow-fetch && make
|
||||
---> Running in 088dd34d009d
|
||||
fetch http://dl-cdn.alpinelinux.org/alpine/v3.6/main/x86_64/APKINDEX.tar.gz
|
||||
fetch http://dl-cdn.alpinelinux.org/alpine/v3.6/community/x86_64/APKINDEX.tar.gz
|
||||
v3.6.2-10-g9e4a449bfc [http://dl-cdn.alpinelinux.org/alpine/v3.6/main]
|
||||
v3.6.1-61-gc32140e9a2 [http://dl-cdn.alpinelinux.org/alpine/v3.6/community]
|
||||
OK: 8429 distinct packages available
|
||||
fetch http://dl-cdn.alpinelinux.org/alpine/v3.6/main/x86_64/APKINDEX.tar.gz
|
||||
fetch http://dl-cdn.alpinelinux.org/alpine/v3.6/community/x86_64/APKINDEX.tar.gz
|
||||
[91mERROR: unsatisfiable constraints:
|
||||
[0m i-0:
|
||||
masked in: cache
|
||||
satisfies: world[i]
|
||||
build-deps (missing):
|
||||
required by:
|
||||
The command '/bin/sh -c apk -U update && apk -U add -ti build-deps build-base gnupg tar automake autoconf binutils && apk -U add libcurl libressl python boost ncurses jemalloc protobuf wget && cd /tmp && wget https://download.rethinkdb.com/dist/rethinkdb-$RETHINKDB_VERSION.tgz && tar xf rethinkdb-$RETHINKDB_VERSION.tgz && cd rethinkdb-$RETHINKDB_VERSION && ./configure --allow-fetch && make' returned a non-zero code: 2
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit ed8df6d79dcf7b13a9f3e54bb6cb57705f92fa3a
|
||||
Reference in New Issue