From 8578d09c3811ebd5eb26b4d814553ae24535a4f5 Mon Sep 17 00:00:00 2001 From: bzp2010 Date: Sun, 23 Aug 2020 15:27:03 +0800 Subject: [PATCH] fix(ci): fix read configuration file path in docker --- api/Dockerfile | 2 +- api/build.sh | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/api/Dockerfile b/api/Dockerfile index 264672aabf..bba8f0aefb 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -24,7 +24,7 @@ RUN mkdir /root/manager-api \ && export GOPROXY=https://goproxy.io \ && go build -o /root/manager-api/manager-api \ && mv /go/src/github.com/apisix/manager-api/build.sh /root/manager-api/ \ - && mv /go/src/github.com/apisix/manager-api/conf/conf_preview.json /root/manager-api/ \ + && mv /go/src/github.com/apisix/manager-api/conf/conf_preview.json /root/manager-api/conf.json \ && rm -rf /go/src/github.com/apisix/manager-api \ && rm -rf /etc/localtime \ && ln -s /usr/share/zoneinfo/Hongkong /etc/localtime \ diff --git a/api/build.sh b/api/build.sh index 086fe73c51..09e6e014ad 100644 --- a/api/build.sh +++ b/api/build.sh @@ -1,21 +1,22 @@ #!/bin/sh # # 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. +# 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. # +export ENV=prod pwd=`pwd` sed -i -e "s%#mysqlAddress#%`echo $MYSQL_SERVER_ADDRESS`%g" ${pwd}/conf.json