Compare commits
No commits in common. "b674704a31f02b3ede9f0e2b4398ac12f94d996a" and "25959b65cac78b05cc8e52912e2cc2667caac0f7" have entirely different histories.
b674704a31
...
25959b65ca
45
.drone.yml
45
.drone.yml
@ -1,45 +0,0 @@
|
|||||||
---
|
|
||||||
kind: pipeline
|
|
||||||
type: docker
|
|
||||||
name: Build
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: build
|
|
||||||
image: plugins/docker
|
|
||||||
commands:
|
|
||||||
- sleep 5
|
|
||||||
- docker build -t docker.pbiernat.dev/nginx-php .
|
|
||||||
- docker images | grep nginx-php
|
|
||||||
volumes:
|
|
||||||
- name: docker-sock
|
|
||||||
path: /var/run
|
|
||||||
|
|
||||||
- name: publish
|
|
||||||
image: plugins/docker
|
|
||||||
environment:
|
|
||||||
DOCKER_USERNAME:
|
|
||||||
from_secret: registry_username
|
|
||||||
DOCKER_PASSWORD:
|
|
||||||
from_secret: registry_password
|
|
||||||
commands:
|
|
||||||
- sleep 5
|
|
||||||
- docker login docker.pbiernat.dev -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
|
|
||||||
- docker push docker.pbiernat.dev/nginx-php
|
|
||||||
when:
|
|
||||||
branch: master
|
|
||||||
volumes:
|
|
||||||
- name: docker-sock
|
|
||||||
path: /var/run
|
|
||||||
|
|
||||||
services:
|
|
||||||
- name: docker
|
|
||||||
image: docker:dind
|
|
||||||
privileged: true
|
|
||||||
volumes:
|
|
||||||
- name: docker-sock
|
|
||||||
path: /var/run
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
- name: docker-sock
|
|
||||||
temp: {}
|
|
||||||
|
|
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,3 +1 @@
|
|||||||
.history/
|
.history/
|
||||||
|
|
||||||
/test
|
|
@ -1,7 +1,7 @@
|
|||||||
FROM alpine:latest
|
FROM alpine:latest
|
||||||
|
|
||||||
RUN apk add --update --no-cache coreutils supervisor acl nginx make curl bash icu-libs \
|
RUN apk add --update --no-cache coreutils supervisor acl nginx make curl bash \
|
||||||
&& mkdir -p /run/nginx && mkdir /var/www/app && mkdir /run/php
|
&& mkdir /run/nginx && mkdir /var/www/app && mkdir /run/php
|
||||||
|
|
||||||
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
|
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
|
||||||
php7 php7-fpm php7-opcache php7-mysqli php7-json php7-openssl php7-curl php7-zlib composer \
|
php7 php7-fpm php7-opcache php7-mysqli php7-json php7-openssl php7-curl php7-zlib composer \
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
# This is a default site configuration which will simply return 404, preventing
|
||||||
|
# chance access to any other virtualhost.
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80 default_server;
|
listen 80 default_server;
|
||||||
listen [::]:80 default_server;
|
listen [::]:80 default_server;
|
||||||
@ -40,5 +43,4 @@ server {
|
|||||||
|
|
||||||
error_log /var/log/nginx/app_error.log;
|
error_log /var/log/nginx/app_error.log;
|
||||||
access_log /var/log/nginx/app_access.log;
|
access_log /var/log/nginx/app_access.log;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user