particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

store: introduce state directory

Browse source 
Prior to this commit outputs directory used by local target was owned by root.
This made impossible for osbuild-composer to delete images. (osbuild-composer
doesn't run as root).

This commit introduces state directory in which osbuild-composer creates
outputs directory. Because this directory is owned by osbuild-composer, it's
able to delete files inside.
This commit is contained in:
Ondřej Budai 2019-12-09 12:11:52 +01:00 • committed by Lars Karlitski
parent 0cf8a20744
commit 6d15833e4e
5 changed files with 24 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

29
internal/store/store.go
View file

@ -39,6 +39,7 @@ type Store struct {
pendingJobs chan Job
stateChannel chan []byte
distro distro.Distro
stateDir *string
}
// A Compose represent the task of building one image. It contains all the information
@ -110,12 +111,19 @@ func (e *InvalidRequestError) Error() string {
return e.message
}
func New(stateFile *string, distro distro.Distro) *Store {
func New(stateDir *string, distro distro.Distro) *Store {
var s Store
if stateFile != nil {
state, err := ioutil.ReadFile(*stateFile)
if state != nil {
if stateDir != nil {
err := os.Mkdir(*stateDir+"/"+"outputs", 0755)
if err != nil && !os.IsExist(err) {
log.Fatalf("cannot create output directory")
}
stateFile := *stateDir + "/state.json"
state, err := ioutil.ReadFile(stateFile)
if err == nil {
err := json.Unmarshal(state, &s)
if err != nil {
log.Fatalf("invalid initial state: %v", err)
@ -128,7 +136,7 @@ func New(stateFile *string, distro distro.Distro) *Store {
go func() {
for {
err := writeFileAtomically(*stateFile, <-s.stateChannel, 0755)
err := writeFileAtomically(stateFile, <-s.stateChannel, 0755)
if err != nil {
log.Fatalf("cannot write state: %v", err)
}
@ -155,6 +163,7 @@ func New(stateFile *string, distro distro.Distro) *Store {
s.pendingJobs = make(chan Job, 200)
s.distro = distro
s.stateDir = stateDir
return &s
}
@ -407,12 +416,14 @@ func (s *Store) DeleteBlueprintFromWorkspace(name string) {
}
func (s *Store) PushCompose(composeID uuid.UUID, bp *blueprint.Blueprint, composeType string, uploadTarget *target.Target) error {
targets := []*target.Target{
target.NewLocalTarget(
targets := []*target.Target{}
if s.stateDir != nil {
targets = append(targets, target.NewLocalTarget(
&target.LocalTargetOptions{
Location: "/var/lib/osbuild-composer/outputs/" + composeID.String(),
Location: *s.stateDir + "/outputs/" + composeID.String(),
},
),
))
}
if uploadTarget != nil {