Skip to content

Commit 080aded

Browse files
authored
Merge pull request #33 from Dstack-TEE/ds-up
Update dstack/ and corresponding refactor
2 parents ad305b0 + 8b06b6b commit 080aded

5 files changed

Lines changed: 23 additions & 12 deletions

File tree

build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ GATEWAY_PUBLIC_DOMAIN=<your domain for zt-https>
8585
# for certbot
8686
CERTBOT_ENABLED=false
8787
CF_API_TOKEN=
88-
CF_ZONE_ID=
8988
ACME_URL=https://acme-staging-v02.api.letsencrypt.org/directory
9089
EOF
9190
if [ -f $CONFIG_FILE ]; then
@@ -113,7 +112,10 @@ EOF
113112
build_host() {
114113
echo "Building binaries"
115114
(cd $DSTACK_DIR && cargo build --release --target-dir ${RUST_BUILD_DIR})
116-
cp ${RUST_BUILD_DIR}/release/{dstack-gateway,dstack-kms,dstack-vmm,supervisor} .
115+
for bin in dstack-gateway dstack-kms dstack-vmm supervisor; do
116+
cp "${RUST_BUILD_DIR}/release/${bin}" ".${bin}.new"
117+
mv -f ".${bin}.new" "./${bin}"
118+
done
117119
}
118120

119121
# Step 2: build guest images
@@ -221,8 +223,6 @@ workdir = "$CERBOT_WORKDIR"
221223
acme_url = "$ACME_URL"
222224
# Cloudflare API token
223225
cf_api_token = "$CF_API_TOKEN"
224-
# Cloudflare zone ID
225-
cf_zone_id = "$CF_ZONE_ID"
226226
# Auto set CAA record
227227
auto_set_caa = true
228228
# Domain to issue certificates for

dstack

Submodule dstack updated 188 files
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Disable all password-based authentication
2+
PasswordAuthentication no
3+
PermitEmptyPasswords no
4+
KbdInteractiveAuthentication no
5+
6+
# Only allow public key authentication
7+
PubkeyAuthentication yes
8+
PermitRootLogin prohibit-password
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
2+
3+
SRC_URI += "file://disable-password-auth.conf"
4+
5+
do_install:append() {
6+
install -d ${D}${sysconfdir}/ssh/sshd_config.d
7+
install -m 0644 ${UNPACKDIR}/disable-password-auth.conf ${D}${sysconfdir}/ssh/sshd_config.d/
8+
}
9+
10+
FILES:${PN}-sshd += "${sysconfdir}/ssh/sshd_config.d/"

meta-dstack/recipes-core/images/dstack-rootfs-base.inc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,4 @@ mkdirs() {
142142
mkdir -p ${IMAGE_ROOTFS}/etc/wireguard
143143
mkdir -p ${IMAGE_ROOTFS}/var/lib/docker
144144
ln -sf dstack ${IMAGE_ROOTFS}/tapp
145-
146-
# Aliases passwd files to a subdirectory
147-
mkdir -p ${IMAGE_ROOTFS}/etc/users
148-
mv ${IMAGE_ROOTFS}/etc/passwd ${IMAGE_ROOTFS}/etc/users/
149-
mv ${IMAGE_ROOTFS}/etc/shadow ${IMAGE_ROOTFS}/etc/users/
150-
ln -s users/passwd ${IMAGE_ROOTFS}/etc/passwd
151-
ln -s users/shadow ${IMAGE_ROOTFS}/etc/shadow
152145
}

0 commit comments

Comments
 (0)