IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-10 15:45:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Build(devenv): correct the context issue (#17291)

Browse Source 
With the previous configuration `docker-compose build` was always failing.
This moves the dockerfiles in the parent dir and changes paths as a result.

Ref moby/moby#2745
This commit is contained in:
Oleg Gaidarenko 2019-05-27 14:05:32 +03:00 committed by GitHub
parent db32c7dcf5
commit 2146f837cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devenv/docker/blocks/multiple-openldap/ldap-server/Dockerfile → devenv/docker/blocks/multiple-openldap/admins-ldap-server.Dockerfile
View File

@ -19,11 +19,11 @@ EXPOSE 389
VOLUME ["/etc/ldap", "/var/lib/ldap"]
COPY modules/ /etc/ldap.dist/modules
COPY prepopulate/ /etc/ldap.dist/prepopulate
COPY admins-ldap-server/modules/ /etc/ldap.dist/modules
COPY admins-ldap-server/prepopulate/ /etc/ldap.dist/prepopulate
COPY ../entrypoint.sh /entrypoint.sh
COPY ../prepopulate.sh /prepopulate.sh
COPY ./entrypoint.sh /entrypoint.sh
COPY ./prepopulate.sh /prepopulate.sh
ENTRYPOINT ["/entrypoint.sh"]

8
devenv/docker/blocks/multiple-openldap/docker-compose.yaml
View File

@ -1,5 +1,7 @@
admins-openldap:
build: docker/blocks/multiple-openldap/admins-ldap-server
build:
context: docker/blocks/multiple-openldap
dockerfile: ./admins-ldap-server.Dockerfile
environment:
SLAPD_PASSWORD: grafana
SLAPD_DOMAIN: grafana.org
@ -8,7 +10,9 @@
- "389:389"
openldap:
build: docker/blocks/multiple-openldap/ldap-server
build:
context: docker/blocks/multiple-openldap
dockerfile: ./ldap-server.Dockerfile
environment:
SLAPD_PASSWORD: grafana
SLAPD_DOMAIN: grafana.org

8
devenv/docker/blocks/multiple-openldap/admins-ldap-server/Dockerfile → devenv/docker/blocks/multiple-openldap/ldap-server.Dockerfile
View File

@ -19,11 +19,11 @@ EXPOSE 389
VOLUME ["/etc/ldap", "/var/lib/ldap"]
COPY modules/ /etc/ldap.dist/modules
COPY prepopulate/ /etc/ldap.dist/prepopulate
COPY ldap-server/modules/ /etc/ldap.dist/modules
COPY ldap-server/prepopulate/ /etc/ldap.dist/prepopulate
COPY ../entrypoint.sh /entrypoint.sh
COPY ../prepopulate.sh /prepopulate.sh
COPY ./entrypoint.sh /entrypoint.sh
COPY ./prepopulate.sh /prepopulate.sh
ENTRYPOINT ["/entrypoint.sh"]