From c395db88572c8aaa5330245ee13db75371f648d0 Mon Sep 17 00:00:00 2001
From: Tomas Srnka <tomas.srnka@gmail.com>
Date: Tue, 19 Mar 2019 10:32:53 +0100
Subject: [PATCH] Docker fix

---
 docker/7.3/Dockerfile => Dockerfile           | 4 ++--
 docker/7.3/cloudbuild.yaml => cloudbuild.yaml | 2 +-
 docker/{7.3 => }/host.conf                    | 0
 docker/{7.3 => }/start.sh                     | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename docker/7.3/Dockerfile => Dockerfile (90%)
 rename docker/7.3/cloudbuild.yaml => cloudbuild.yaml (70%)
 rename docker/{7.3 => }/host.conf (100%)
 rename docker/{7.3 => }/start.sh (100%)

diff --git a/docker/7.3/Dockerfile b/Dockerfile
similarity index 90%
rename from docker/7.3/Dockerfile
rename to Dockerfile
index bc04373..95dbcfb 100644
--- a/docker/7.3/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y \
 RUN mkdir -p /var/run/memcached
 RUN chown memcache:memcache /var/run/memcached
 
-COPY host.conf /etc/host.conf
+COPY docker/host.conf /etc/host.conf
 
 RUN set -eux;\
 	cd /usr/src; \
@@ -28,5 +28,5 @@ RUN set -eux;\
 
 RUN echo "" 
 
-COPY start.sh /
+COPY docker/start.sh /
 CMD ["/start.sh"]
diff --git a/docker/7.3/cloudbuild.yaml b/cloudbuild.yaml
similarity index 70%
rename from docker/7.3/cloudbuild.yaml
rename to cloudbuild.yaml
index c0156ea..c0f6c76 100644
--- a/docker/7.3/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -1,6 +1,6 @@
 steps:
 - name: 'gcr.io/cloud-builders/docker'
-  args: [ 'build', '-t', 'gcr.io/pecl-memcache/php-73', 'docker/7.3/' ]
+  args: [ 'build', '-t', 'gcr.io/pecl-memcache/php-73', '.' ]
 - name: 'gcr.io/cloud-builders/docker'
   args: ['run', 'gcr.io/pecl-memcache/php-73']
 images:
diff --git a/docker/7.3/host.conf b/docker/host.conf
similarity index 100%
rename from docker/7.3/host.conf
rename to docker/host.conf
diff --git a/docker/7.3/start.sh b/docker/start.sh
similarity index 100%
rename from docker/7.3/start.sh
rename to docker/start.sh