development image based on ubi8

Author: eguzki

Dockerfile.devel

@@ -0,0 +1,68 @@
+FROM registry.access.redhat.com/ubi8:8.5
+
+ARG OPENRESTY_RPM_VERSION="1.19.3"
+ARG LUAROCKS_VERSION="2.3.0"
+
+WORKDIR /tmp
+
+ENV APP_ROOT=/opt/app-root \
+    HOME=/opt/app-root/src \
+    PATH=/opt/app-root/src/bin:/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
+    PLATFORM="el8"
+
+RUN sed -i s/enabled=./enabled=0/g /etc/yum/pluginconf.d/subscription-manager.conf
+
+RUN yum upgrade -y 
+
+RUN dnf install -y 'dnf-command(config-manager)'
+
+RUN yum install -y \
+        gcc make git which curl expat-devel kernel-headers openssl-devel m4 \
+        libyaml libyaml-devel perl-local-lib perl-App-cpanminus
+
+# perl-Test-Nginx
+RUN cpanm https://cpan.metacpan.org/authors/id/A/AG/AGENT/Test-Nginx-0.29.tar.gz
+
+RUN yum config-manager --add-repo http://packages.dev.3sca.net/dev_packages_3sca_net.repo
+
+RUN yum install -y \
+        openresty-${OPENRESTY_RPM_VERSION} \
+        openresty-resty-${OPENRESTY_RPM_VERSION} \
+        openresty-opentracing-${OPENRESTY_RPM_VERSION} \
+        jaegertracing-cpp-client 
+
+RUN ln -sf /dev/stdout /usr/local/openresty/nginx/logs/access.log \
+    && ln -sf /dev/stderr /usr/local/openresty/nginx/logs/error.log \
+    && mkdir -p /usr/local/openresty/nginx/client_body_temp/ \
+    && chmod 777 /usr/local/openresty/nginx/client_body_temp/
+
+COPY site_config.lua /usr/share/lua/5.1/luarocks/site_config.lua
+COPY config-*.lua /usr/local/openresty/config-5.1.lua
+
+ENV PATH="./lua_modules/bin:/usr/local/openresty/luajit/bin/:${PATH}" \
+    LUA_PATH="./lua_modules/share/lua/5.1/?.lua;./lua_modules/share/lua/5.1/?/init.lua;/usr/lib64/lua/5.1/?.lua;/usr/share/lua/5.1/?.lua" \
+    LUA_CPATH="./lua_modules/lib/lua/5.1/?.so;;" \
+    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/app-root/lib"
+
+RUN yum install -y luarocks && \
+    luarocks install --server=http://luarocks.org/dev lua-rover && \
+    rover -v && \
+    yum -y remove luarocks && \
+    ln -s /usr/bin/rover /usr/local/openresty/luajit/bin/ && \
+    chmod g+w "${HOME}/.cache" && \
+    rm -rf /var/cache/yum && yum clean all -y && \
+    rm -rf "${HOME}/.cache/luarocks" ./*
+
+# Directory with the sources is set as the working directory so all STI scripts
+# can execute relative to this path.
+WORKDIR ${HOME}
+
+# Reset permissions of modified directories and add default user
+RUN useradd -u 1001 -r -g 0 -d ${HOME} -s /sbin/nologin \
+      -c "Default Application User" default && \
+    chown -R 1001:0 ${APP_ROOT}
+
+USER 1001
+WORKDIR ${HOME}
+EXPOSE 8080
+CMD ["/bin/bash"]

Makefile

@@ -1,6 +1,8 @@
+MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
+PROJECT_PATH := $(patsubst %/,%,$(dir $(MKFILE_PATH)))
 .DEFAULT_GOAL := help
-
 DOCKER_COMPOSE = docker-compose
+DOCKER ?= $(shell which podman 2> /dev/null || which docker 2> /dev/null || echo "docker")
 S2I = script/s2i
 REGISTRY ?= quay.io/3scale
 export TEST_NGINX_BINARY ?= openresty
@@ -16,8 +18,8 @@ OPENRESTY_VERSION ?= master
 BUILDER_IMAGE ?= quay.io/3scale/s2i-openresty-centos7:$(OPENRESTY_VERSION)
 RUNTIME_IMAGE ?= $(BUILDER_IMAGE)-runtime
 
-DEVEL_IMAGE ?= apicast-development
-DEVEL_DOCKERFILE ?= Dockerfile-development
+DEVEL_IMAGE ?= apicast-development:latest
+DEVEL_DOCKERFILE ?= Dockerfile.devel
 
 DEVEL_DOCKER_COMPOSE_FILE ?= docker-compose-devel.yml
 DEVEL_DOCKER_COMPOSE_VOLMOUNT_MAC_FILE ?= docker-compose-devel-volmount-mac.yml
@@ -64,6 +66,15 @@ export COMPOSE_PROJECT_NAME
 
 .PHONY: benchmark lua_modules
 
+.PHONY: dev-build
+dev-build: export OPENRESTY_RPM_VERSION?=1.19.3
+dev-build: export LUAROCKS_VERSION?=2.3.0
+dev-build:
+	$(DOCKER) build -t $(DEVEL_IMAGE) \
+		--build-arg OPENRESTY_RPM_VERSION=$(OPENRESTY_RPM_VERSION) \
+		--build-arg LUAROCKS_VERSION=$(LUAROCKS_VERSION) \
+		$(PROJECT_PATH) -f $(DEVEL_DOCKERFILE)
+
 test: ## Run all tests
 	$(MAKE) --keep-going busted prove builder-image test-builder-image prove-docker runtime-image test-runtime-image
 
@@ -208,6 +219,7 @@ endif
 development: .docker/lua_modules .docker/local .docker/cpanm .docker/vendor/cache
 development: ## Run bash inside the development image
 	@echo "Running on $(os)"
+	@$(DOCKER) history -q $(DEVEL_IMAGE) 2> /dev/null >&2 || $(MAKE) -C $(PROJECT_PATH) -f $(MKFILE_PATH) dev-build
 	- $(DOCKER_COMPOSE) -f $(DEVEL_DOCKER_COMPOSE_FILE) -f $(DEVEL_DOCKER_COMPOSE_VOLMOUNT_FILE) up -d
 	@ # https://github.com/moby/moby/issues/33794#issuecomment-312873988 for fixing the terminal width
 	$(DOCKER_COMPOSE) -f $(DEVEL_DOCKER_COMPOSE_FILE) -f $(DEVEL_DOCKER_COMPOSE_VOLMOUNT_FILE) exec -e COLUMNS="`tput cols`" -e LINES="`tput lines`" --user $(USER) development bash

config-5.1.lua

@@ -0,0 +1,6 @@
+lua_interpreter = [[resty]]
+lib_modules_path = [[/lib/lua/]]..lua_version
+
+variables = {
+	LUAROCKS_PREFIX = [[/usr]]
+}

docker-compose-devel-volmount-default.yml

@@ -4,7 +4,7 @@ services:
     privileged: true
     pid: "host"
     volumes:
-      - .:/home/centos/
-      - .docker/cpanm:/home/centos/.cpanm
+      - .:/opt/app-root/src/
+      - .docker/cpanm:/opt/app-root/src/.cpanm
       - /sys/kernel/debug:/sys/kernel/debug
       - /lib/modules:/lib/module

docker-compose-devel-volmount-mac.yml

@@ -2,5 +2,5 @@ version: '2.2'
 services:
   development:
     volumes:
-      - .:/home/centos/:cached
-      - .docker/cpanm:/home/centos/.cpanm:delegated
+      - .:/opt/app-root/src/:cached
+      - .docker/cpanm:/opt/app-root/src/.cpanm:delegated

docker-compose-devel.yml

@@ -1,28 +1,29 @@
+---
 version: '2.2'
 services:
   development:
-    image: ${IMAGE:-quay.io/3scale/s2i-openresty-centos7:1.19.3.6-20-centos8}
+    image: ${IMAGE:-apicast-development:latest}
     depends_on:
       - redis
-    working_dir: /home/centos/
+    working_dir: /opt/app-root/src/
     volumes:
-      - .docker/lua_modules:/home/centos/lua_modules
-      - .docker/local:/home/centos/local
-      - .docker/vendor/cache:/home/centos/vendor/cache
+      - .docker/lua_modules:/opt/app-root/src/lua_modules
+      - .docker/local:/opt/app-root/src/local
+      - .docker/vendor/cache:/opt/app-root/src/vendor/cache
       # no need to access those from docker
-      - /home/centos/.docker
-      - /home/centos/.git
+      - /opt/app-root/src/.docker
+      - /opt/app-root/src/.git
     command: cat
     tty: true
     init: true
     environment:
       EDITOR: vi
       TEST_NGINX_REDIS_HOST: redis
       TEST_NGINX_BINARY: openresty
-      PROJECT_PATH: /home/centos
-      TEST_NGINX_APICAST_PATH: /home/centos/gateway
+      PROJECT_PATH: /opt/app-root/src
+      TEST_NGINX_APICAST_PATH: /opt/app-root/src/gateway
       ROVER: /usr/local/openresty/luajit/bin/rover
-      HOME: /home/centos/
+      HOME: /opt/app-root/src/
       # https://github.com/jenkinsci/docker/issues/519#issuecomment-313052325
       GIT_COMMITTER_NAME: ${GIT_COMMITTER_NAME:-${USER}}
       GIT_COMMITTER_EMAIL: ${GIT_COMMITTER_EMAIL:-""}

site_config.lua

@@ -0,0 +1,24 @@
+local site_config = { }
+
+local openresty = [[/usr/local/openresty]]
+local luajit = openresty .. [[/luajit]]
+
+site_config.LUAROCKS_SYSCONFIG=openresty .. [[/config-5.1.lua]]
+site_config.LUA_INTERPRETER=[[resty]]
+site_config.LUA_DIR_SET=false
+site_config.LUAROCKS_PREFIX= [[/usr]]
+site_config.LUA_INCDIR= luajit .. [[/include/luajit-2.1]]
+site_config.LUA_LIBDIR= luajit .. [[/lib/5.1]]
+site_config.LUA_BINDIR= openresty .. [[/bin]]
+site_config.LUAROCKS_SYSCONFDIR=[[/etc/luarocks]]
+site_config.LUAROCKS_ROCKS_TREE=[[/usr/local/openresty/luajit]]
+site_config.LUAROCKS_ROCKS_SUBDIR=[[/luarocks/rocks]]
+site_config.LUAROCKS_UNAME_S=[[Linux]]
+site_config.LUAROCKS_UNAME_M=[[x86_64]]
+site_config.LUAROCKS_DOWNLOADER=[[curl]]
+site_config.LUAROCKS_MD5CHECKER=[[md5sum]]
+
+site_config.LUAROCKS_EXTERNAL_DEPS_SUBDIRS={ bin="bin", lib={ "lib", [[lib64]] }, include="include" }
+site_config.LUAROCKS_RUNTIME_EXTERNAL_DEPS_SUBDIRS={ bin="bin", lib={ "lib", [[lib64]] }, include="include" }
+
+return site_config