File tree Expand file tree Collapse file tree 6 files changed +21
-41
lines changed
Expand file tree Collapse file tree 6 files changed +21
-41
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ RUN apt-get update \
1010ARG VERSION=latest
1111RUN echo $VERSION > /VERSION
1212
13- COPY tmp /cvm-agent
13+ COPY . /cvm-agent
1414
1515RUN wget --no-proxy --progress=bar:force -c https://dl.google.com/go/go1.24.9.linux-amd64.tar.gz -O - | tar -xz -C /usr/local
1616ENV PATH=$PATH:/usr/local/go/bin
@@ -127,16 +127,14 @@ COPY --from=build /usr/local/lib/rats-tls/ /usr/local/lib/rats-tls/
127127RUN mkdir -p /workplace/cvm-agent/cvmassistants/secretprovider
128128COPY --from=build /cvm-agent/cvmassistants/secretprovider/secret-provider-agent/secret_provider_agent /workplace/cvm-agent/cvmassistants/secretprovider
129129
130- # RUN echo "export LD_LIBRARY_PATH=/usr/local/lib/rats-tls:$LD_LIBRARY_PATH" >> /etc/profile
131-
132130# config supervisord
133131RUN apt-get update \
134132 && env DEBIAN_FRONTEND=noninteractive apt-get install -y \
135133 supervisor \
136134 curl
137135
138136# todo make supervisord.conf configurable so that it can change the log path
139- COPY --from=build /cvm-agent/base-image/ supervisord/supervisord.conf /etc/supervisor/
137+ COPY --from=build /cvm-agent/supervisord/supervisord.conf /etc/supervisor/
140138COPY --from=build /cvm-agent/apploader/conf/appload-supervisord.ini /workplace/supervisord/apploader
141139
142140# install firewall
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -55,8 +55,7 @@ Running:
5555To build the confidential VM base image:
5656
5757``` bash
58- cd base-image
59- bash release.sh buildimage
58+ bash release.sh
6059```
6160
6261This will compile all necessary components (e.g., the secret provider agent) and produce a Docker image named ``` cvm-base ```
Original file line number Diff line number Diff line change 1+ #! /bin/bash
2+ set -o errexit
3+ set -x
4+ BASE_NAME=cvm-base
5+ BASE_DIR=" $( cd " $( dirname " $0 " ) " && pwd ) "
6+ VERSION=$( git tag -l --points-at HEAD| awk -F' v' ' {print $2}' )
7+
8+ if [ -z " $VERSION " ] ; then
9+ VERSION=latest
10+ fi
11+
12+ git_commit=" $( git rev-parse --short=8 HEAD) "
13+ build_time=$( date +%F-%H-%M-%S)
14+ release_desc=" ${VERSION} -${git_commit} -${build_time} "
15+
16+ PROXY=$1
17+ echo " ---> Build Image"
18+ docker build --no-cache --build-arg VERSION=$release_desc --build-arg https_proxy=${PROXY} -t $BASE_NAME :${VERSION} .
File renamed without changes.
File renamed without changes.
You can’t perform that action at this time.
0 commit comments