chore(image): add git to container image

Author: duanhongyi

docker/Dockerfile

@@ -16,26 +16,18 @@ ENV DRYCC_UID=1001 \
 
 COPY --from=build /usr/local/bin/drycc /usr/local/bin/drycc
 
-ADD docker/entrypoint.sh /entrypoint.sh
+ADD docker/rootfs /
 
-RUN install-packages bash-completion \
+RUN install-packages bash-completion git vim \
   && groupadd drycc --gid ${DRYCC_GID} \
   && useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR} \
-  && mkdir -p /etc/bash_completion.d \
-  && drycc completion bash > /etc/bash_completion.d/drycc \
-  && chown ${DRYCC_GID}:${DRYCC_UID} /usr/local/bin \
+  && mkdir -p /etc/wait \
+  && chown ${DRYCC_GID}:${DRYCC_UID} /etc/wait /usr/local/bin \
   && echo 'alias cd="echo \"cd: restricted\"; false"' > ${DRYCC_HOME_DIR}/.bash_aliases \
   && echo 'alias unalias="echo \"unalias: restricted\"; false"' >> ${DRYCC_HOME_DIR}/.bash_aliases \
-  && ln -s /usr/bin/ls /usr/local/bin/ls \
-  && ln -s /usr/bin/cat /usr/local/bin/cat \
-  && ln -s /usr/bin/sed /usr/local/bin/sed \
-  && ln -s /usr/bin/find /usr/local/bin/find \
-  && ln -s /usr/bin/bash /usr/local/bin/bash \
-  && ln -s /usr/bin/mkdir /usr/local/bin/mkdir \
-  && ln -s /usr/bin/sleep /usr/local/bin/sleep \
-  && ln -s /usr/bin/dircolors /usr/local/bin/dircolors \
-  && ln -s /usr/bin/tini /usr/local/bin/tini \
-  && ln -s /usr/bin/init-stack /usr/local/bin/init-stack
+  && ln /usr/bin/{ls,git,date,vim,cat,sed,clear,find,flock,bash,mkdir,sleep,dircolors} /usr/local/bin/ \
+  && apt autoremove python3 -yq \
+  && rm -rf /var/lib/apt/lists/* /sbin /usr/sbin /usr/bin
 
 ENTRYPOINT [ "/entrypoint.sh" ] 
 

docker/entrypoint.sh docker/rootfs/entrypoint.shdocker/entrypoint.sh renamed to docker/rootfs/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
 
 if [ -n "$DRYCC_USER" ] && [ -n "$DRYCC_TOKEN" ] && [ -n "$DRYCC_ENDPOINT" ]; then
     mkdir -p ~/.drycc
@@ -19,9 +19,15 @@ _main() {
     if [ "$1" == 'bash' ]; then
         shift
         exec bash "$@"
+    elif [ "$1" == 'wait' ]; then
+        shift
+        /etc/bash_completion.d/timeout
+        while [ "$(date +%s)" -le "$(flock -x -w 10 /tmp/timeout.lock cat /etc/wait/timeout)" ]; do
+            sleep ${TIMEOUT:-30}
+        done
     else
         exec drycc "$@"
     fi
 }
 
-_main "$@"
+_main "$@"

docker/rootfs/etc/bash_completion.d/drycc

@@ -0,0 +1,3 @@
+#!/usr/local/bin/bash
+
+source <(drycc completion bash)

docker/rootfs/etc/bash_completion.d/ps1

@@ -0,0 +1,3 @@
+#!/usr/local/bin/bash
+
+export PS1="\e[32m> \e[0m"

docker/rootfs/etc/bash_completion.d/timeout

@@ -0,0 +1,5 @@
+#!/usr/local/bin/bash
+
+flock -x -w 10 /tmp/timeout.lock cat << EOF > /etc/wait/timeout
+$(($(date +%s) + ${TIMEOUT:-30}))
+EOF

internal/utils/utils_test.go

@@ -35,6 +35,12 @@ func TestLoadProject(t *testing.T) {
 
 	assert.NoError(t, os.Chdir(name))
 
+	os.Setenv("DRYCC_APP", "testapp")
+	appID, _, err = LoadAppSettings(filename, "")
+	assert.NoError(t, err)
+	assert.Equal(t, appID, "testapp", "app")
+	os.Unsetenv("DRYCC_APP")
+
 	appID, _, err = LoadAppSettings(filename, "")
 	assert.NoError(t, err)
 	assert.Equal(t, appID, filepath.Base(name), "app")

pkg/git/git.go

@@ -108,6 +108,9 @@ func DetectAppName(cmd Cmd, host string) (string, error) {
 
 	// Don't return an error if remote can't be found, return directory name instead.
 	if err != nil {
+		if appName, ok := os.LookupEnv("DRYCC_APP"); ok {
+			return appName, nil
+		}
 		dir, err := os.Getwd()
 		return strings.ToLower(filepath.Base(dir)), err
 	}