diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fa778cb..dce97f5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,12 +17,12 @@ env: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - misspell-check: - runs-on: ubuntu-latest - container: pouchcontainer/pouchlinter:v0.1.2 - steps: - - name: Checkout - uses: actions/checkout@v2 +# misspell-check: +# runs-on: ubuntu-latest +# container: pouchcontainer/pouchlinter:v0.1.2 +# steps: +# - name: Checkout +# uses: actions/checkout@v2 # - name: Lint markdown files # run: find ./ -name "*.md" | xargs mdl -r ~MD010,~MD013,~MD022,~MD024,~MD029,~MD031,~MD032,~MD033,~MD034,~MD036 diff --git a/practise/image-practise/main.go b/practise/image-practise/main.go index 5ca8212..27e7111 100644 --- a/practise/image-practise/main.go +++ b/practise/image-practise/main.go @@ -9,6 +9,11 @@ import ( "go-learning/practise/image-practise/image" ) +const ( + defaultUser = "pixiu" + defaultPassword = "123456" +) + var ( harbor = flag.String("harbor", "harbor.cloud.pixiuio.com", "Choose a harbor to push (default harbor.cloud.pixiuio.com") imageRepository = flag.String("image-repository", "pixiuio", "Choose a container registry to push (default pixiuio") @@ -32,11 +37,20 @@ func main() { klog.Fatal(err) } + loginUser := *user + if len(loginUser) == 0 || loginUser == "--password" { + loginUser = defaultUser + } + loginPassword := *password + if len(loginPassword) == 0 { + loginPassword = defaultPassword + } + img := image.Image{ Harbor: *harbor, ImageRepository: *imageRepository, - User: *user, - Password: *password, + User: loginUser, + Password: loginPassword, Cfg: cfg, } diff --git a/practise/sftp-practise.go b/practise/sftp-practise.go index e7deadf..3dde7ca 100644 --- a/practise/sftp-practise.go +++ b/practise/sftp-practise.go @@ -70,6 +70,12 @@ func CopyFromRemote(remoteFile, localFile, user, passwd, host string, port int) } defer srcFile.Close() + // 直接读到内存 + //buf, err := io.ReadAll(srcFile) + //if err != nil { + // return nil, err + //} + f, err := os.Create(localFile) if err != nil { return fmt.Errorf("create file %s failed %v", localFile, err)