archive repository

Signed-off-by: William Douglas <william.douglas@intel.com>

README.md

@@ -1,3 +1,10 @@
+## DISCONTINUATION OF PROJECT. 
+
+This project will no longer be maintained by Intel. 
+
+Intel will not provide or guarantee development of or support for this project, including but not limited to, maintenance, bug fixes, new releases or updates. Patches to this project are no longer accepted by Intel. If you have an ongoing need to use this project, are interested in independently developing it, or would like to maintain patches for the community, please create your own fork of the project.
+
+Contact: webadmin@linux.intel.com  
 Clear Linux* based Docker Containers
 ====================================
 ![](https://github.com/clearlinux/dockerfiles/workflows/CI/badge.svg)

nginx/Dockerfile

@@ -19,7 +19,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=nginx-mainline --no-boot-update
+    --bundles=nginx --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same
@@ -33,26 +33,21 @@ RUN cd / && \
 FROM core
 
 COPY --from=builder /install_root /
-COPY default.conf /etc/nginx-mainline/conf.d/default.conf
+COPY default.conf /etc/nginx/conf.d/default.conf
 
-# create directories for nginx-mainline
+# create directories for nginx
 RUN mkdir -p /var/www/html && \
-    mkdir -p /etc/nginx-mainline && \
-    mkdir -p /var/log/nginx-mainline && \
-    mkdir -p /var/lib/nginx-mainline/uwsgi && \
-    mkdir -p /var/lib/nginx-mainline/client-body && \
-    mkdir -p /var/lib/nginx-mainline/proxy && \
-    mkdir -p /var/lib/nginx-mainline/fast-cgi && \
-    # add links to make it compatible with general name nginx
-    ln -sf /var/log/nginx-mainline /var/log/nginx && \
-    ln -sf /var/lib/nginx-mainline /var/lib/nginx && \
-    ln -sf /etc/nginx-mainline /etc/nginx && \
-    ln -sf /usr/bin/nginx-mainline /usr/bin/nginx && \
+    mkdir -p /etc/nginx && \
+    mkdir -p /var/log/nginx && \
+    mkdir -p /var/lib/nginx/uwsgi && \
+    mkdir -p /var/lib/nginx/client-body && \
+    mkdir -p /var/lib/nginx/proxy && \
+    mkdir -p /var/lib/nginx/fast-cgi && \
     # forward request and error logs to docker log collector
-    ln -sf /dev/stdout /var/log/nginx-mainline/access.log && \
-    ln -sf /dev/stderr /var/log/nginx-mainline/error.log && \
-    cp -f /usr/share/nginx-mainline/conf/nginx.conf.example /etc/nginx-mainline/nginx.conf && \
-    cp -f /usr/share/nginx-mainline/html/* /var/www/html/
+    ln -sf /dev/stdout /var/log/nginx/access.log && \
+    ln -sf /dev/stderr /var/log/nginx/error.log && \
+    cp -f /usr/share/nginx/conf/nginx.conf.example /etc/nginx/nginx.conf && \
+    cp -f /usr/share/nginx/html/* /var/www/html/
 
 EXPOSE 80
 STOPSIGNAL SIGTERM

nginx/default.conf

@@ -3,6 +3,6 @@ server {
   location / {
     root /var/www/html;
     autoindex on;
-    access_log /var/log/nginx-mainline/access.log combined;
+    access_log /var/log/nginx/access.log combined;
   }
 }

nginx/hooks/post_push

@@ -2,6 +2,6 @@
 . ../docker-hooks.sh
 
 image="clearlinux/nginx"
-package=nginx-mainline
+package=nginx
 
 do_tag $image $package