diff --git a/.semaphore/pipeline_2.yml b/.semaphore/pipeline_2.yml index c6445f2..11568ac 100644 --- a/.semaphore/pipeline_2.yml +++ b/.semaphore/pipeline_2.yml @@ -13,14 +13,14 @@ blocks: - checkout - git submodule update --init --recursive - 'docker pull $DOCKER_USERNAME/cloud9-ide-vdi:latest || true' - - 'cd /rootfs/workspace/configuration && ./configure.py --desktop enabled' + - 'cd ./configuration && ./configure.py --desktop enabled' - 'docker build --cache-from=$DOCKER_USERNAME/cloud9-ide-vdi:latest -t devindice/cloud9-ide-vdi .' - '# Login to Dockerhub' - 'echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin' - '# Create a version' - 'docker image tag devindice/cloud9-ide-vdi:latest devindice/cloud9-ide-vdi:testing' - 'docker push $DOCKER_USERNAME/cloud9-ide-vdi:testing' - - 'cd /rootfs/workspace/configuration && ./configure.py --desktop disabled' + - 'cd ./configuration && ./configure.py --desktop disabled' - 'docker build --cache-from=$DOCKER_USERNAME/cloud9-ide-vdi:latest -t devindice/cloud9-ide-vdi .' - 'docker image tag devindice/cloud9-ide-vdi:latest devindice/cloud9-ide-vdi:no-desktop-testing' - 'docker push $DOCKER_USERNAME/cloud9-ide-vdi:no-desktop-testing' diff --git a/rootfs/workspace/configuration/configure.py b/configuration/configure.py similarity index 88% rename from rootfs/workspace/configuration/configure.py rename to configuration/configure.py index f2c85f4..93764ac 100755 --- a/rootfs/workspace/configuration/configure.py +++ b/configuration/configure.py @@ -10,7 +10,7 @@ args = parser.parse_args() # Default Nginx environment = Environment(loader=FileSystemLoader("./")) template = environment.get_template("nginx_default.j2") -filename = f"../../etc/nginx/sites-enabled/default" +filename = f"../rootfs/etc/nginx/sites-enabled/default" content = template.render( desktop=args.desktop, ) @@ -22,7 +22,7 @@ with open(filename, mode="w", encoding="utf-8") as message: # Supervisor Conf environment = Environment(loader=FileSystemLoader("./")) template = environment.get_template("supervisord.conf.j2") -filename = f"../../etc/supervisor/conf.d/supervisord.conf" +filename = f"../rootfs/etc/supervisor/conf.d/supervisord.conf" content = template.render( desktop=args.desktop, diff --git a/rootfs/workspace/configuration/nginx_default.j2 b/configuration/nginx_default.j2 similarity index 100% rename from rootfs/workspace/configuration/nginx_default.j2 rename to configuration/nginx_default.j2 diff --git a/rootfs/workspace/configuration/supervisord.conf.j2 b/configuration/supervisord.conf.j2 similarity index 100% rename from rootfs/workspace/configuration/supervisord.conf.j2 rename to configuration/supervisord.conf.j2