Skip to content

Commit b66af7f

Browse files
authored
Merge pull request #6 from soubinan/dev
Update systemd files and add chrony package
2 parents 831aacc + 3f2b368 commit b66af7f

4 files changed

Lines changed: 12 additions & 3 deletions

File tree

.github/workflows/build.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,11 @@ jobs:
6767
- name: Sign the published container images
6868
if: github.event_name == 'release'
6969
run: |
70-
cosign sign --yes --key env://COSIGN_PRIVATE_KEY "${TAGS}@${DIGEST}"
70+
images=""
71+
for tag in ${TAGS}; do
72+
images+="${tag}@${DIGEST} "
73+
done
74+
cosign sign --yes --key env://COSIGN_PRIVATE_KEY ${images}
7175
env:
7276
TAGS: ${{ steps.meta.outputs.tags }}
7377
DIGEST: ${{ steps.build-and-push.outputs.digest }}

Containerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ COPY ./rocky.repo /etc/yum.repos.d/rocky.repo
88
RUN yum clean all && \
99
yum update -y && \
1010
yum upgrade --refresh -y && \
11-
yum install cloudstack-management hostname nfs-utils -y && \
11+
yum install cloudstack-management chrony hostname nfs-utils -y && \
1212
yum clean all
1313
RUN wget https://download.cloudstack.org/tools/vhd-util -O /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util
1414

1515
COPY ./cloudstack-init.env /etc/default/cloudstack-init
1616
COPY ./cloudstack-init.service /etc/systemd/system/cloudstack-init.service
1717
COPY ./cloudstack-management.service /etc/systemd/system/cloudstack-management.service
1818

19-
RUN systemctl enable cloudstack-init && \
19+
RUN systemctl enable chronyd && \
20+
systemctl enable cloudstack-init && \
2021
systemctl enable cloudstack-management
2122

2223
HEALTHCHECK --interval=15s --timeout=5s --start-period=5s --retries=3 \

cloudstack-init.service

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ EnvironmentFile=/etc/default/cloudstack-init
1010
ExecStart=/usr/bin/cloudstack-setup-databases ${DB_CS_USER}:${DB_CS_PASSWD}@${DB_HOST} --schema-only -e ${ENCRYPTION_TYPE} -m ${MGT_SERVER_KEY} -k ${DB_KEY}
1111
ExecStart=/usr/bin/cloudstack-setup-management
1212
ExecStart=/usr/bin/touch /var/cloudstack/.cloudstack-provisionned__
13+
StandardOutput=journal+console
14+
StandardError=journal+console
1315

1416
[Install]
1517
WantedBy=multi-user.target

cloudstack-management.service

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ EnvironmentFile=/etc/default/cloudstack-management
1010
WorkingDirectory=/var/log/cloudstack/management
1111
PIDFile=/var/run/cloudstack-management.pid
1212
ExecStart=/usr/bin/java $JAVA_DEBUG $JAVA_OPTS -cp $CLASSPATH $BOOTSTRAP_CLASS
13+
StandardOutput=journal+console
14+
StandardError=journal+console
1315

1416
[Install]
1517
WantedBy=multi-user.target

0 commit comments

Comments
 (0)