ziggi/mstore
1
0
Fork 0
Code Pull Requests Actions Packages Projects Releases Wiki Activity

working commit

Browse Source
This commit is contained in:
Олег Бородин
2026-03-08 21:45:34 +02:00
parent 2f80ce8543
commit 7cf9c4320e
3 changed files with 362 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+155 -36
View File
@@ -10,12 +10,38 @@ mstorectl_SOURCES = \
cmd/mstorectl/main.go \ cmd/mstorectl/main.go \
cmd/mstorectl/util.go cmd/mstorectl/util.go
EXTRA_mstorectl_SOURCES = EXTRA_mstorectl_SOURCES = \
cmd/mstorectl/accountcmd/acccmd.go \
cmd/mstorectl/accountcmd/auxfunc.go \
mstored_SOURCES = cmd/mstored/main.go cmd/mstorectl/accountcmd/createacc.go \
EXTRA_mstored_SOURCES = cmd/mstored/starter/starter.go cmd/mstorectl/accountcmd/creategrant.go \
cmd/mstorectl/accountcmd/delacc.go \
cmd/mstorectl/accountcmd/delgrant.go \
cmd/mstorectl/accountcmd/getacc.go \
cmd/mstorectl/accountcmd/getgrant.go \
cmd/mstorectl/accountcmd/grantcmd.go \
cmd/mstorectl/accountcmd/listacc.go \
cmd/mstorectl/accountcmd/listgrant.go \
cmd/mstorectl/accountcmd/printresp.go \
cmd/mstorectl/accountcmd/updacc.go \
cmd/mstorectl/accountcmd/updgrant.go \
cmd/mstorectl/filecmd/delcoll.go \
cmd/mstorectl/filecmd/delfile.go \
cmd/mstorectl/filecmd/expfiles.go \
cmd/mstorectl/filecmd/filecmd.go \
cmd/mstorectl/filecmd/fileinfo.go \
cmd/mstorectl/filecmd/getfile.go \
cmd/mstorectl/filecmd/impfiles.go \
cmd/mstorectl/filecmd/listcolls.go \
cmd/mstorectl/filecmd/listfiles.go \
cmd/mstorectl/filecmd/putfile.go \
cmd/mstorectl/imagecmd/imagecmd.go \
cmd/mstorectl/imagecmd/printresp.go \
cmd/mstorectl/main.go \
cmd/mstorectl/util.go
mstored_SOURCES = cmd/mstored/main.go \
cmd/mstored/starter/starter.go
mstorectl$(EXEEXT): $(mstorectl_SOURCES) $(EXTRA_mstorectl_SOURCES) $(EXTRA_mstored_SOURCES) mstorectl$(EXEEXT): $(mstorectl_SOURCES) $(EXTRA_mstorectl_SOURCES) $(EXTRA_mstored_SOURCES)
env CGO_ENABLED=0 $(GO) build $(GOFLAGS) -o mstorectl$(EXEEXT) $(mstorectl_SOURCES) env CGO_ENABLED=0 $(GO) build $(GOFLAGS) -o mstorectl$(EXEEXT) $(mstorectl_SOURCES)
@@ -28,19 +54,28 @@ run: $(mstored_SOURCES)
CWD=$(shell pwd) CWD=$(shell pwd)
EXTRA_mstored_SOURCES += \ EXTRA_mstored_SOURCES = \
app/accoper/createacc.go \
app/accoper/creategrant.go \
app/accoper/delacc.go \
app/accoper/delgrant.go \
app/accoper/getacc.go \
app/accoper/getgrant.go \
app/accoper/listacc.go \
app/accoper/listgrant.go \
app/accoper/operator.go \
app/accoper/updacc.go \
app/accoper/updgrant.go \
app/config/config.go \ app/config/config.go \
app/config/variant.go \ app/config/variant.go \
\ app/fileoper/delcats.go \
pkg/descr/account.go \ app/fileoper/delfile.go \
pkg/descr/blob.go \ app/fileoper/fileinfo.go \
pkg/descr/file.go \ app/fileoper/getfile.go \
pkg/descr/grant.go \ app/fileoper/listcats.go \
pkg/descr/manifest.go \ app/fileoper/listfiles.go \
pkg/descr/server.go \ app/fileoper/operator.go \
\ app/fileoper/putfile.go \
pkg/terms/terms.go \
\
app/handler/aaafunc.go \ app/handler/aaafunc.go \
app/handler/account.go \ app/handler/account.go \
app/handler/blob.go \ app/handler/blob.go \
@@ -52,8 +87,26 @@ EXTRA_mstored_SOURCES += \
app/handler/response.go \ app/handler/response.go \
app/handler/service.go \ app/handler/service.go \
app/handler/version.go \ app/handler/version.go \
app/imageoper/blobexist.go \
app/imageoper/delblob.go \
app/imageoper/delman.go \
app/imageoper/getblob.go \
app/imageoper/getman.go \
app/imageoper/getrefer.go \
app/imageoper/gettags.go \
app/imageoper/imgaux.go \
app/imageoper/listman.go \
app/imageoper/manexist.go \
app/imageoper/ociaux.go \
app/imageoper/operator.go \
app/imageoper/patchupload.go \
app/imageoper/postupload.go \
app/imageoper/putman.go \
app/imageoper/putupload.go \
app/imageoper/service.go \
app/imageoper/version.go \
app/locker/locker.go \
app/logger/logger.go \ app/logger/logger.go \
\
app/maindb/account.go \ app/maindb/account.go \
app/maindb/blob.go \ app/maindb/blob.go \
app/maindb/file.go \ app/maindb/file.go \
@@ -62,11 +115,30 @@ EXTRA_mstored_SOURCES += \
app/maindb/maindb.go \ app/maindb/maindb.go \
app/maindb/manifest.go \ app/maindb/manifest.go \
app/maindb/scheme.go \ app/maindb/scheme.go \
\ app/router/bindobj.go \
app/router/context.go \
app/router/corsmw.go \
app/router/loggingmw.go \
app/router/pathc.go \
app/router/recovermw.go \
app/router/router.go \
app/server/server.go \ app/server/server.go \
app/service/service.go \ app/service/service.go \
app/storage/storage.go \ app/storage/storage.go \
\ pkg/accntcli/client.go \
pkg/accntcli/createacc.go \
pkg/accntcli/creategrant.go \
pkg/accntcli/delacc.go \
pkg/accntcli/delgrant.go \
pkg/accntcli/getacc.go \
pkg/accntcli/getgrant.go \
pkg/accntcli/httpcall.go \
pkg/accntcli/listacc.go \
pkg/accntcli/listgrants.go \
pkg/accntcli/referer.go \
pkg/accntcli/servhello.go \
pkg/accntcli/updateacc.go \
pkg/accntcli/updgrant.go \
pkg/auxhttp/basic.go \ pkg/auxhttp/basic.go \
pkg/auxhttp/crange.go \ pkg/auxhttp/crange.go \
pkg/auxoci/ociaux.go \ pkg/auxoci/ociaux.go \
@@ -79,7 +151,6 @@ EXTRA_mstored_SOURCES += \
pkg/auxutar/utar.go \ pkg/auxutar/utar.go \
pkg/auxuuid/uuid.go \ pkg/auxuuid/uuid.go \
pkg/auxx509/x509cert.go \ pkg/auxx509/x509cert.go \
\
pkg/client/account.go \ pkg/client/account.go \
pkg/client/client.go \ pkg/client/client.go \
pkg/client/grant.go \ pkg/client/grant.go \
@@ -89,7 +160,46 @@ EXTRA_mstored_SOURCES += \
pkg/client/imageinfo.go \ pkg/client/imageinfo.go \
pkg/client/imagepull.go \ pkg/client/imagepull.go \
pkg/client/imagepush.go \ pkg/client/imagepush.go \
pkg/client/service.go pkg/client/servaux.go \
pkg/client/service.go \
pkg/descr/account.go \
pkg/descr/blob.go \
pkg/descr/file.go \
pkg/descr/grant.go \
pkg/descr/manifest.go \
pkg/descr/server.go \
pkg/digest/digest.go \
pkg/filecli/authbas.go \
pkg/filecli/client.go \
pkg/filecli/copyctx.go \
pkg/filecli/delcoll.go \
pkg/filecli/delfile.go \
pkg/filecli/fileinfo.go \
pkg/filecli/getfile.go \
pkg/filecli/listcoll.go \
pkg/filecli/listfiles.go \
pkg/filecli/putfile.go \
pkg/filecli/referer.go \
pkg/repocli/blobexist.go \
pkg/repocli/client.go \
pkg/repocli/copywctx.go \
pkg/repocli/delblob.go \
pkg/repocli/delman.go \
pkg/repocli/getblob.go \
pkg/repocli/getman.go \
pkg/repocli/gettoken.go \
pkg/repocli/getupload.go \
pkg/repocli/imager.go \
pkg/repocli/manexist.go \
pkg/repocli/patchupload.go \
pkg/repocli/pullimage.go \
pkg/repocli/putman.go \
pkg/repocli/putupload.go \
pkg/repocli/reference.go \
pkg/repocli/referer.go \
pkg/repocli/uuid.go \
pkg/terms/terms.go
EXTRA_DIST = vendor/ \ EXTRA_DIST = vendor/ \
\ \
@@ -99,17 +209,6 @@ EXTRA_DIST = vendor/ \
LICENSE.txt \ LICENSE.txt \
README.md \ README.md \
\ \
app/logger/logger_test.go \
app/maindb/file_test.go \
app/maindb/grant_test.go \
app/router/pathc_test.go \
app/router/router_test.go \
\
pkg/auxpwd/passwd_test.go \
pkg/auxx509/x509cert_test.go \
attic/account_test.go \
attic/file_test.go \
\
chart/Chart.yaml.in \ chart/Chart.yaml.in \
chart/.gitignore \ chart/.gitignore \
chart/.helmignore \ chart/.helmignore \
@@ -150,10 +249,30 @@ EXTRA_DIST = vendor/ \
initrc/mstored.in \ initrc/mstored.in \
initrc/mstored.service.in \ initrc/mstored.service.in \
\ \
test/account_test.go \ app/locker/locker_test.go \
test/file_test.go \ app/logger/logger_test.go \
test/image_test.go \ app/maindb/file_test.go \
test/test-oci.tar app/maindb/grant_test.go \
app/router/pathc_test.go \
app/router/router_test.go \
pkg/auxpwd/passwd_test.go \
pkg/auxx509/x509cert_test.go \
pkg/repocli/blobexist_test.go \
pkg/repocli/copywctx_test.go \
pkg/repocli/getblob_test.go \
pkg/repocli/getman_test.go \
pkg/repocli/gettoken_test.go \
pkg/repocli/getupload_test.go \
pkg/repocli/imager_test.go \
pkg/repocli/manexist_test.go \
pkg/repocli/pullimage_test.go \
pkg/repocli/referer_test.go
\
docs/helm-chart-manifest.json.txt \
docs/mstore.drawio \
docs/mstore.png \
docs/podman-manifest.json.txt
format: format:
Makefile.in
+202 -43
View File
@@ -356,35 +356,186 @@ mstorectl_SOURCES = \
cmd/mstorectl/main.go \ cmd/mstorectl/main.go \
cmd/mstorectl/util.go cmd/mstorectl/util.go
EXTRA_mstorectl_SOURCES = EXTRA_mstorectl_SOURCES = \
mstored_SOURCES = cmd/mstored/main.go cmd/mstorectl/accountcmd/acccmd.go \
EXTRA_mstored_SOURCES = cmd/mstored/starter/starter.go \ cmd/mstorectl/accountcmd/auxfunc.go \
app/config/config.go app/config/variant.go \ cmd/mstorectl/accountcmd/createacc.go \
pkg/descr/account.go pkg/descr/blob.go pkg/descr/file.go \ cmd/mstorectl/accountcmd/creategrant.go \
pkg/descr/grant.go pkg/descr/manifest.go pkg/descr/server.go \ cmd/mstorectl/accountcmd/delacc.go \
pkg/terms/terms.go app/handler/aaafunc.go \ cmd/mstorectl/accountcmd/delgrant.go \
app/handler/account.go app/handler/blob.go app/handler/file.go \ cmd/mstorectl/accountcmd/getacc.go \
app/handler/grant.go app/handler/handler.go \ cmd/mstorectl/accountcmd/getgrant.go \
app/handler/manifest.go app/handler/notfound.go \ cmd/mstorectl/accountcmd/grantcmd.go \
app/handler/response.go app/handler/service.go \ cmd/mstorectl/accountcmd/listacc.go \
app/handler/version.go app/logger/logger.go \ cmd/mstorectl/accountcmd/listgrant.go \
app/maindb/account.go app/maindb/blob.go app/maindb/file.go \ cmd/mstorectl/accountcmd/printresp.go \
app/maindb/grant.go app/maindb/init.go app/maindb/maindb.go \ cmd/mstorectl/accountcmd/updacc.go \
app/maindb/manifest.go app/maindb/scheme.go \ cmd/mstorectl/accountcmd/updgrant.go \
app/server/server.go app/service/service.go \ cmd/mstorectl/filecmd/delcoll.go \
app/storage/storage.go pkg/auxhttp/basic.go \ cmd/mstorectl/filecmd/delfile.go \
pkg/auxhttp/crange.go pkg/auxoci/ociaux.go \ cmd/mstorectl/filecmd/expfiles.go \
pkg/auxpwd/passwd.go pkg/auxtool/cleandir.go \ cmd/mstorectl/filecmd/filecmd.go \
pkg/auxtool/fileex.go pkg/auxtool/randstr.go \ cmd/mstorectl/filecmd/fileinfo.go \
pkg/auxtool/tmpfile.go pkg/auxtool/unixnow.go \ cmd/mstorectl/filecmd/getfile.go \
pkg/auxutar/utar.go pkg/auxuuid/uuid.go \ cmd/mstorectl/filecmd/impfiles.go \
pkg/auxx509/x509cert.go pkg/client/account.go \ cmd/mstorectl/filecmd/listcolls.go \
pkg/client/client.go pkg/client/grant.go \ cmd/mstorectl/filecmd/listfiles.go \
pkg/client/httpcall.go pkg/client/imageaux.go \ cmd/mstorectl/filecmd/putfile.go \
pkg/client/imagedelete.go pkg/client/imageinfo.go \ cmd/mstorectl/imagecmd/imagecmd.go \
pkg/client/imagepull.go pkg/client/imagepush.go \ cmd/mstorectl/imagecmd/printresp.go \
pkg/client/service.go cmd/mstorectl/main.go \
cmd/mstorectl/util.go
mstored_SOURCES = cmd/mstored/main.go \
cmd/mstored/starter/starter.go
CWD = $(shell pwd) CWD = $(shell pwd)
EXTRA_mstored_SOURCES = \
app/accoper/createacc.go \
app/accoper/creategrant.go \
app/accoper/delacc.go \
app/accoper/delgrant.go \
app/accoper/getacc.go \
app/accoper/getgrant.go \
app/accoper/listacc.go \
app/accoper/listgrant.go \
app/accoper/operator.go \
app/accoper/updacc.go \
app/accoper/updgrant.go \
app/config/config.go \
app/config/variant.go \
app/fileoper/delcats.go \
app/fileoper/delfile.go \
app/fileoper/fileinfo.go \
app/fileoper/getfile.go \
app/fileoper/listcats.go \
app/fileoper/listfiles.go \
app/fileoper/operator.go \
app/fileoper/putfile.go \
app/handler/aaafunc.go \
app/handler/account.go \
app/handler/blob.go \
app/handler/file.go \
app/handler/grant.go \
app/handler/handler.go \
app/handler/manifest.go \
app/handler/notfound.go \
app/handler/response.go \
app/handler/service.go \
app/handler/version.go \
app/imageoper/blobexist.go \
app/imageoper/delblob.go \
app/imageoper/delman.go \
app/imageoper/getblob.go \
app/imageoper/getman.go \
app/imageoper/getrefer.go \
app/imageoper/gettags.go \
app/imageoper/imgaux.go \
app/imageoper/listman.go \
app/imageoper/manexist.go \
app/imageoper/ociaux.go \
app/imageoper/operator.go \
app/imageoper/patchupload.go \
app/imageoper/postupload.go \
app/imageoper/putman.go \
app/imageoper/putupload.go \
app/imageoper/service.go \
app/imageoper/version.go \
app/locker/locker.go \
app/logger/logger.go \
app/maindb/account.go \
app/maindb/blob.go \
app/maindb/file.go \
app/maindb/grant.go \
app/maindb/init.go \
app/maindb/maindb.go \
app/maindb/manifest.go \
app/maindb/scheme.go \
app/router/bindobj.go \
app/router/context.go \
app/router/corsmw.go \
app/router/loggingmw.go \
app/router/pathc.go \
app/router/recovermw.go \
app/router/router.go \
app/server/server.go \
app/service/service.go \
app/storage/storage.go \
pkg/accntcli/client.go \
pkg/accntcli/createacc.go \
pkg/accntcli/creategrant.go \
pkg/accntcli/delacc.go \
pkg/accntcli/delgrant.go \
pkg/accntcli/getacc.go \
pkg/accntcli/getgrant.go \
pkg/accntcli/httpcall.go \
pkg/accntcli/listacc.go \
pkg/accntcli/listgrants.go \
pkg/accntcli/referer.go \
pkg/accntcli/servhello.go \
pkg/accntcli/updateacc.go \
pkg/accntcli/updgrant.go \
pkg/auxhttp/basic.go \
pkg/auxhttp/crange.go \
pkg/auxoci/ociaux.go \
pkg/auxpwd/passwd.go \
pkg/auxtool/cleandir.go \
pkg/auxtool/fileex.go \
pkg/auxtool/randstr.go \
pkg/auxtool/tmpfile.go \
pkg/auxtool/unixnow.go \
pkg/auxutar/utar.go \
pkg/auxuuid/uuid.go \
pkg/auxx509/x509cert.go \
pkg/client/account.go \
pkg/client/client.go \
pkg/client/grant.go \
pkg/client/httpcall.go \
pkg/client/imageaux.go \
pkg/client/imagedelete.go \
pkg/client/imageinfo.go \
pkg/client/imagepull.go \
pkg/client/imagepush.go \
pkg/client/servaux.go \
pkg/client/service.go \
pkg/descr/account.go \
pkg/descr/blob.go \
pkg/descr/file.go \
pkg/descr/grant.go \
pkg/descr/manifest.go \
pkg/descr/server.go \
pkg/digest/digest.go \
pkg/filecli/authbas.go \
pkg/filecli/client.go \
pkg/filecli/copyctx.go \
pkg/filecli/delcoll.go \
pkg/filecli/delfile.go \
pkg/filecli/fileinfo.go \
pkg/filecli/getfile.go \
pkg/filecli/listcoll.go \
pkg/filecli/listfiles.go \
pkg/filecli/putfile.go \
pkg/filecli/referer.go \
pkg/repocli/blobexist.go \
pkg/repocli/client.go \
pkg/repocli/copywctx.go \
pkg/repocli/delblob.go \
pkg/repocli/delman.go \
pkg/repocli/getblob.go \
pkg/repocli/getman.go \
pkg/repocli/gettoken.go \
pkg/repocli/getupload.go \
pkg/repocli/imager.go \
pkg/repocli/manexist.go \
pkg/repocli/patchupload.go \
pkg/repocli/pullimage.go \
pkg/repocli/putman.go \
pkg/repocli/putupload.go \
pkg/repocli/reference.go \
pkg/repocli/referer.go \
pkg/repocli/uuid.go \
pkg/terms/terms.go
EXTRA_DIST = vendor/ \ EXTRA_DIST = vendor/ \
\ \
Containerfile \ Containerfile \
@@ -393,17 +544,6 @@ EXTRA_DIST = vendor/ \
LICENSE.txt \ LICENSE.txt \
README.md \ README.md \
\ \
app/logger/logger_test.go \
app/maindb/file_test.go \
app/maindb/grant_test.go \
app/router/pathc_test.go \
app/router/router_test.go \
\
pkg/auxpwd/passwd_test.go \
pkg/auxx509/x509cert_test.go \
attic/account_test.go \
attic/file_test.go \
\
chart/Chart.yaml.in \ chart/Chart.yaml.in \
chart/.gitignore \ chart/.gitignore \
chart/.helmignore \ chart/.helmignore \
@@ -444,10 +584,24 @@ EXTRA_DIST = vendor/ \
initrc/mstored.in \ initrc/mstored.in \
initrc/mstored.service.in \ initrc/mstored.service.in \
\ \
test/account_test.go \ app/locker/locker_test.go \
test/file_test.go \ app/logger/logger_test.go \
test/image_test.go \ app/maindb/file_test.go \
test/test-oci.tar app/maindb/grant_test.go \
app/router/pathc_test.go \
app/router/router_test.go \
pkg/auxpwd/passwd_test.go \
pkg/auxx509/x509cert_test.go \
pkg/repocli/blobexist_test.go \
pkg/repocli/copywctx_test.go \
pkg/repocli/getblob_test.go \
pkg/repocli/getman_test.go \
pkg/repocli/gettoken_test.go \
pkg/repocli/getupload_test.go \
pkg/repocli/imager_test.go \
pkg/repocli/manexist_test.go \
pkg/repocli/pullimage_test.go \
pkg/repocli/referer_test.go
DIST_DIR = $(shell pwd)/DIST DIST_DIR = $(shell pwd)/DIST
BUILD_DIR = $(shell pwd)/BUILD BUILD_DIR = $(shell pwd)/BUILD
@@ -1050,6 +1204,11 @@ mstored$(EXEEXT): $(mstored_SOURCES) $(EXTRA_mstored_SOURCES)
run: $(mstored_SOURCES) run: $(mstored_SOURCES)
cd cmd/mstored && env CGO_ENABLED=1 $(GO) run . --asDaemon=false cd cmd/mstored && env CGO_ENABLED=1 $(GO) run . --asDaemon=false
\
docs/helm-chart-manifest.json.txt \
docs/mstore.drawio \
docs/mstore.png \
docs/podman-manifest.json.txt
format: format:
@dirs=$$($(FIND) $(CWD)/app $(CWD)/cmd $(CWD)/pkg $(CWD)/test \ @dirs=$$($(FIND) $(CWD)/app $(CWD)/cmd $(CWD)/pkg $(CWD)/test \
app/config/variant.go
+5 -5
View File
@@ -1,10 +1,10 @@
package config package config
const ( const (
confdir = "/home/ziggi/Projects/mstore/etc/mstore" confdir = "/home/ziggi/mstore2/etc/mstore"
rundir = "/home/ziggi/Projects/mstore/tmp/run" rundir = "/home/ziggi/mstore2/tmp/run"
logdir = "/home/ziggi/Projects/mstore/tmp/log" logdir = "/home/ziggi/mstore2/tmp/log"
datadir = "/home/ziggi/Projects/mstore/tmp/data" datadir = "/home/ziggi/mstore2/tmp/data"
version = "0.2.0" version = "0.2.0"
srvname = "mstored" srvname = "mstored"
) )