Merge pull request '[fix] Fixed image building config.' (#2) from develop into master
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: https://git.pbiernat.dev/docker/nginx-php/pulls/2
This commit is contained in:
commit
b674704a31
45
.drone.yml
Normal file
45
.drone.yml
Normal file
@ -0,0 +1,45 @@
|
||||
---
|
||||
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 +1,3 @@
|
||||
.history/
|
||||
.history/
|
||||
|
||||
/test
|
||||
|
@ -1,7 +1,7 @@
|
||||
FROM alpine:latest
|
||||
|
||||
RUN apk add --update --no-cache coreutils supervisor acl nginx make curl bash \
|
||||
&& mkdir /run/nginx && mkdir /var/www/app && mkdir /run/php
|
||||
RUN apk add --update --no-cache coreutils supervisor acl nginx make curl bash icu-libs \
|
||||
&& mkdir -p /run/nginx && mkdir /var/www/app && mkdir /run/php
|
||||
|
||||
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 \
|
||||
|
@ -1,6 +1,3 @@
|
||||
# This is a default site configuration which will simply return 404, preventing
|
||||
# chance access to any other virtualhost.
|
||||
|
||||
server {
|
||||
listen 80 default_server;
|
||||
listen [::]:80 default_server;
|
||||
@ -43,4 +40,5 @@ server {
|
||||
|
||||
error_log /var/log/nginx/app_error.log;
|
||||
access_log /var/log/nginx/app_access.log;
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user