24 Commits

Author SHA1 Message Date
William Douglas 65634bce18 Convert nginx to not use mainline
Signed-off-by: William Douglas <william.douglas@intel.com>
2025-04-15 17:05:20 -07:00
William Douglas 114295de66 Add workflow to publish container images on github
Note that variable expansion in --from and FROM was working oddly,
see: https://github.com/docker/cli/issues/3356#issuecomment-957892224
for context.
2024-06-14 13:31:19 -07:00
Gong Sophia e4492a299e Deprecates MAINTAINER in Dockerfile to follow dockerhub official guide.
(https://docs.docker.com/engine/reference/builder/#/maintainer-deprecated)

Signed-off-by: Gong Sophia <sophia.gong@intel.com>
2019-12-23 09:59:05 +08:00
Qi Zheng 4f2d5c684d Unify the tags way
For version format x.y.z, three tags as below
    tag: x.y.z
    tag1: x.y
    tag2: x
They all point to the latest image.
Once app got updated (minor updates, z to z1), the tag x.y.z
will be replaced by x.y.z1, but the tag x or x.y may still
keep.

Signed-off-by: Qi Zheng <qi.zheng@intel.com>
2019-11-20 10:49:12 +08:00
Qi Zheng 06124f36f0 Add tag for httpd, mariadb, memcached
and nginx, postgres, ...

Two tags are to be added for each containers.
1. exact app version tag, usually format as x.y.z.
For example, 5.0.6 for redis.
2. major app version tag, usually format as x.
For example, 5 for redis.
For some special cases, the major format as x.y.
For example, 1.17 for nginx, 3.7 for python.

Signed-off-by: Qi Zheng <qi.zheng@intel.com>
2019-11-14 14:34:40 +08:00
puneetse f1956bccba Fix kubernetes YAML URLS
Change relative URLs to full. Relative URLs don't render on hub.docker.com
2019-08-30 09:00:11 +08:00
ZhongbaoShi 1d98164389 Update README.md 2019-08-26 13:46:21 +08:00
puneetse 46b0ab79b1 Update nginx README.md 2019-08-23 08:05:51 +08:00
Lu Ken 2c0a0b70ae update document root to /var/www/html in nginx deployment template 2019-08-20 14:31:08 +08:00
Lu Ken 38dc86acee add kubernetes deployment template for nginx container 2019-08-09 09:37:28 -07:00
Qi Zheng d7b52070b2 Update nginx from 1.14 to 1.17
Signed-off-by: Qi Zheng <qi.zheng@intel.com>
2019-08-08 19:58:24 -07:00
Liu, Jianjun 70fe47244a Use --no-boot-update for nginx
Use --no-boot-update instead of --no-scripts for nginx.

Signed-off-by: Liu, Jianjun <jianjun.liu@intel.com>
2019-07-24 21:14:55 -07:00
Liu, Jianjun 8710d447d3 no swupd state data removing in 1st build stage
During the 1st stage build of multi-stage build, when
run swupd os-install, the swupd state data are saved to
/swupd_state, which will not be copied to the target.
So we do not need to remove swupd state data.

Signed-off-by: Liu, Jianjun <jianjun.liu@intel.com>
2019-07-25 08:47:11 +08:00
Liu, Jianjun 07d1c7c968 Hide the expected warning msg
When removing the duplicated file and directory via rm -d,
if it's a non-empty directory, it will prompt the warning
message that the directory could not be removed becuase it
is not empty. This is as expectation, as there are other
files under the same diretory and we need to keep them.
Hide these warning message to avoid confusion.

Signed-off-by: Liu, Jianjun <jianjun.liu@intel.com>
2019-07-09 09:08:01 +08:00
Liu, Jianjun 5c2d1b2fa9 only copy delta files when multistage build
For some Host OS configuration with redirect_dir on,
extra data are saved on the upper layer when the same
file exists on different layers. To minimize docker
image size, remove the overlapped files before copy,
when cgit, httpd, mariadb, memcached, nginx and
postgres.

Signed-off-by: Liu, Jianjun <jianjun.liu@intel.com>
2019-06-18 14:11:12 +08:00
Rusty Lynch b503f4da60 Minimize nginx container using the os-core container.
Convert nginx container to be based on the minimal os-core
container, using a multistage build technique to add additional
Clear Linux content.

Signed-off-by: Rusty Lynch<rusty.lynch@intel.com>
2019-06-07 12:02:08 -07:00
Qi Zheng 8a8844c3e6 Make the swupd update always be the layer two
To help analyze the container image size by layers, assume
each container image be comprised of:
Layer 1: clearlinux:latest
Layer 2: swupd update
Other layers: the container configurations

With this, we can continue to optimize layer size accordingly.

Signed-off-by: Qi Zheng <qi.zheng@intel.com>
2019-05-21 08:46:05 +08:00
Qi Zheng 1bb8d544ab The default root directory is /usr/share/nginx/html
Signed-off-by: Qi Zheng <qi.zheng@intel.com>
2019-05-13 09:42:23 +08:00
puneetse 9fdb36a6ca Add -b to swupd update to avoid cbm errors
No bootloader update necessary in containers so add -b part of Dockerfile. 
Add ARG swupd_args.
2019-05-01 11:54:14 -07:00
puneetse ff6ed72302 Add access_log directive in nginx default.conf
This fixes https://github.com/clearlinux/dockerfiles/issues/112
2019-05-01 11:54:14 -07:00
puneetse c26b654afc Minimize use of RUN instructions
Each RUN instruction adds a layer and size to the docker image. This saved about 14MB in my testing against this image.
2019-05-01 11:54:14 -07:00
puneetse e5434d77d0 Moving COPY higher in the nginx Dockerfile
Moving COPY higher in the Dockerfile makes the docker build fail faster if there is an error. No need to create /etc/nginx/conf.d/ manually.
2019-05-01 11:54:14 -07:00
Patrick McCarty d6864e5c91 Link to swupd-client repo for swupd option docs
This link should be more stable and always provide the latest
information about swupd command-line options.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2019-04-29 13:07:00 -07:00
Bin Yang 53b38a5722 add nginx container
Signed-off-by: Bin Yang <bin.yang@intel.com>
2019-03-27 07:38:35 -07:00