diff --git a/.drone.yml b/.drone.yml
index d5578e0..6ea494c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -16,13 +16,6 @@ steps:
sonar_token:
from_secret: sonar_token
- - name: rewrite-urls
- image: busybox:latest
- commands:
- - find . -type f -exec sed -i "s|\"/|\"$${PLUGIN_CONTAINER_PATH}|g" {} +
- settings:
- container_path: /containers/clementfreville2-drone-health/
-
- name: docker-build-and-push
image: plugins/docker
settings:
@@ -34,8 +27,6 @@ steps:
from_secret: SECRET_REGISTRY_USERNAME
password:
from_secret: SECRET_REGISTRY_PASSWORD
- depends_on:
- - rewrite-urls
- name: deploy-container
image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
@@ -44,6 +35,7 @@ steps:
CONTAINERNAME: drone-health
COMMAND: create
OVERWRITE: true
- CODEFIRST_CLIENTDRONE_ENV_CONTAINER_PATH: clement.freville2-drone-health/
+ # Don't add a trailing slash here
+ CODEFIRST_CLIENTDRONE_ENV_CONTAINER_PATH: /containers/clement.freville2-drone-health
depends_on:
- docker-build-and-push
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6fd0d48..655dd3e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,3 +1,4 @@
FROM php:8.2-apache
+COPY docker/vhost.conf /etc/apache2/sites-available/000-default.conf
COPY . /var/www/html/
diff --git a/docker/vhost.conf b/docker/vhost.conf
new file mode 100644
index 0000000..a47acc8
--- /dev/null
+++ b/docker/vhost.conf
@@ -0,0 +1,6 @@
+
+ DocumentRoot /var/www/html
+ ErrorLog ${APACHE_LOG_DIR}/error.log
+ CustomLog ${APACHE_LOG_DIR}/access.log combined
+ Alias ${CONTAINER_PATH} /var/www/html/
+
diff --git a/index.html b/index.html
index 922d1b3..51f1332 100644
--- a/index.html
+++ b/index.html
@@ -1,8 +1,8 @@
-
+
drone-health - One incredible styled html page
-
+
@@ -28,7 +28,7 @@