[trafficserver-ingress-controller] branch master updated: Upgrade to alpinelinux 3.12.6, go1.15.11, remove log rotation for controller (#83)

[ki...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kichan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
     new dd082c7  Upgrade to alpinelinux 3.12.6, go1.15.11, remove log rotation for controller (#83)
dd082c7 is described below

commit dd082c7b686e03d38dcf86d7616c759a73f6522f
Author: Kit Chan <ki...@apache.org>
AuthorDate: Fri Apr 23 22:02:29 2021 -0700

    Upgrade to alpinelinux 3.12.6, go1.15.11, remove log rotation for controller (#83)
    
    * Upgrade alpinux linux and remove controller log rotation
    
    * Upgrade to go1.15.11
    
    * add back log location for controller
    
    * alpine 3.12.7
    
    * alpine 3.12.7
---
 Dockerfile               | 16 +++++++---------
 README.md                |  4 ++--
 bin/entry.sh             |  4 ----
 config/logrotate.ingress | 23 -----------------------
 docs/DEVELOPMENT.md      |  2 +-
 5 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f036508..01c1708 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-FROM alpine:3.12.3 as builder 
+FROM alpine:3.12.7 as builder 
 
 RUN apk add --no-cache --virtual .tools \
   bzip2 curl git automake libtool autoconf make sed file perl openrc openssl
@@ -70,8 +70,8 @@ RUN apk add --no-cache --virtual .ingress-build-deps \
   bash gcc musl-dev openssl go
 
 # Installing Golang https://github.com/CentOS/CentOS-Dockerfiles/blob/master/golang/centos7/Dockerfile
-RUN wget https://dl.google.com/go/go1.15.6.src.tar.gz \
-    && tar -C /usr/local -xzf go1.15.6.src.tar.gz && cd /usr/local/go/src/ && ./make.bash
+RUN wget https://dl.google.com/go/go1.15.11.src.tar.gz \
+    && tar -C /usr/local -xzf go1.15.11.src.tar.gz && cd /usr/local/go/src/ && ./make.bash
 ENV PATH=${PATH}:/usr/local/go/bin
 ENV GOPATH="/usr/local/go/bin"
 
@@ -107,12 +107,12 @@ RUN chmod 755 tls-reload.sh
 RUN chmod 755 records-config.sh
 RUN chmod 755 entry.sh
 
-FROM alpine:3.12.3
+FROM alpine:3.12.7
 
 COPY --from=builder /usr/local /usr/local
 
 # essential library  
-RUN apk add -U \
+RUN apk add --no-cache -U \
     bash \
     build-base \
     curl ca-certificates \
@@ -130,10 +130,9 @@ RUN apk add -U \
     tcl \
     openrc \
     inotify-tools \
-    cpulimit \
-    logrotate
+    cpulimit
 
-RUN apk add -U --repository https://dl-cdn.alpinelinux.org/alpine/edge/community hwloc
+RUN apk add --no-cache -U --repository https://dl-cdn.alpinelinux.org/alpine/edge/community hwloc
 
 # redis
 RUN mkdir -p /var/run/redis/ \
@@ -145,6 +144,5 @@ RUN ln -sf /usr/lib/libluajit-5.1.so.2.1.0 /usr/lib/libluajit-5.1.so
 
 # set up ingress log location
 RUN mkdir -p /usr/local/var/log/ingress/
-COPY ["./config/logrotate.ingress", "/etc/logrotate.d/ingress"]
 
 ENTRYPOINT ["/usr/local/bin/entry.sh"]
diff --git a/README.md b/README.md
index e121ffd..bf3ca86 100644
--- a/README.md
+++ b/README.md
@@ -30,10 +30,10 @@ ATS Kubernetes Ingress Controller
 - [Development](https://github.com/apache/trafficserver-ingress-controller/blob/master/docs/DEVELOPMENT.md)
 
 ## Versions of Software Used
-- Alpine 3.12.3
+- Alpine 3.12.7
 - Apache Traffic Server 9.0.0
 - LuaJIT 2.0.4 / Lua 5.1.4
-- Go 1.15.6
+- Go 1.15.11
 - Other Packages
   - luasocket 3.0rc1
   - redis-lua 2.0.4
diff --git a/bin/entry.sh b/bin/entry.sh
index 3ab0b92..dc7ac9f 100755
--- a/bin/entry.sh
+++ b/bin/entry.sh
@@ -18,10 +18,6 @@
 
 set +x
 
-# start basic service
-syslogd
-crond
-
 # TLS auto reload script
 /usr/local/bin/tls-reload.sh >> /usr/local/var/log/ingress/ingress_ats.err &
 
diff --git a/config/logrotate.ingress b/config/logrotate.ingress
deleted file mode 100644
index f7dd85d..0000000
--- a/config/logrotate.ingress
+++ /dev/null
@@ -1,23 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-/usr/local/var/log/ingress/ingress_ats.err {
-  daily
-  rotate 2
-  copytruncate
-  missingok
-  compress
-}
diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
index e55211e..2ada178 100644
--- a/docs/DEVELOPMENT.md
+++ b/docs/DEVELOPMENT.md
@@ -20,7 +20,7 @@
 ## Development
 
 ### Develop with Go-Lang in Linux
-1. Get Go-lang 1.15.3 from [official site](https://golang.org/dl/)
+1. Get Go-lang 1.15.11 from [official site](https://golang.org/dl/)
 2. Add `go` command to your PATH: `export PATH=$PATH:/usr/local/go/bin`
 3. Define GOPATH: `export GOPATH=$(go env GOPATH)`
 4. Add Go workspace to your PATH: `export PATH=$PATH:$(go env GOPATH)/bin`