diff --git a/Dockerfile b/Dockerfile index 4f04086..1008ad2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ WORKDIR /astore COPY --from=build /astore /astore/astore COPY --from=build /src/cmd/astore/views /astore/views COPY --from=build /src/cmd/astore/data /astore/data -RUN mkdir -p /astore/apps && mkdir -p /astore/tmp +RUN mkdir -p /astore/data/apps && mkdir -p /astore/tmp EXPOSE 80 ENTRYPOINT ["/astore/astore"] \ No newline at end of file diff --git a/internal/api/private.go b/internal/api/private.go index d9b597c..82354ba 100644 --- a/internal/api/private.go +++ b/internal/api/private.go @@ -128,12 +128,12 @@ func PostApkHandler(ctx *gin.Context) { //log.Println(file.Filename) - err = ctx.SaveUploadedFile(file, "./apps/"+file.Filename) + err = ctx.SaveUploadedFile(file, "./data/apps/"+file.Filename) if err != nil { log.Fatal(err) } - app := apk.ApkProcessor("./apps", file.Filename) + app := apk.ApkProcessor("./data/apps", file.Filename) if globals.Config.BotToken != "" && globals.Config.ChatID != 0 { msg := fmt.Sprintf("New build %s %s is ready", app.AppLabel, app.VersionName) diff --git a/internal/apk/apk.go b/internal/apk/apk.go index 1318686..864f2e8 100644 --- a/internal/apk/apk.go +++ b/internal/apk/apk.go @@ -136,6 +136,6 @@ func moveFile(source string, destination string) { } func GetAPKURL(apk models.Apk) (URL string) { - URL = fmt.Sprintf("%s/apk/%s/%s", globals.Config.Url, apk.SHA256, apk.FileName) + URL = fmt.Sprintf("%s/apps/%s/%s", globals.Config.Url, apk.SHA256, apk.FileName) return URL } diff --git a/internal/globals/globals.go b/internal/globals/globals.go index 1e3a4e4..a0d5866 100644 --- a/internal/globals/globals.go +++ b/internal/globals/globals.go @@ -3,7 +3,7 @@ package globals // SERVICE DESCRIPTION const ServiceFriendlyName = "Android store" const ServiceName = "android-store" -const Version = "1.1.3" +const Version = "1.1.4" // ENVIRONMENT VARIABLES CONFIGURATION STRUCTURE type ConfigStruct struct {