Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Commit

Permalink
first running container from alpine with multi-stage build
Browse files Browse the repository at this point in the history
Signed-off-by: Mohamed Mohamed <mmohamed@us.ibm.com>
  • Loading branch information
midoblgsm committed Sep 5, 2017
1 parent 10a94f9 commit d84b6cc
Show file tree
Hide file tree
Showing 12 changed files with 482 additions and 484 deletions.
15 changes: 15 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM golang:1.7.3
WORKDIR /go/src/github.com/IBM/ubiquity/
COPY . .
RUN go get -v github.com/Masterminds/glide
RUN glide up
RUN CGO_ENABLED=1 GOOS=linux go build -tags netgo -v -a --ldflags '-w -linkmode external -extldflags "-static"' -installsuffix cgo -o ubiquity main.go


FROM alpine:latest
RUN apk --no-cache add ca-certificates
WORKDIR /root/
RUN mkdir -p /tmp/ubiquity
COPY --from=0 /go/src/github.com/IBM/ubiquity/ubiquity .
COPY --from=0 /go/src/github.com/IBM/ubiquity/ubiquity-server.conf .
CMD ["./ubiquity"]
Empty file added deploy/ubiquity_statefulset.yml
Empty file.
56 changes: 28 additions & 28 deletions local/spectrumscale/connectors/mmcli.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ func NewSpectrumMMCLIWithExecutor(logger *log.Logger, executor utils.Executor) (

func (s *spectrum_mmcli) GetClusterId() (string, error) {
spectrumCommand := "/usr/lpp/mmfs/bin/mmlscluster"
args := []string{spectrumCommand}
return GetClusterIdInternal(s.logger, s.executor, "sudo", args)
//args := []string{spectrumCommand}
return GetClusterIdInternal(s.logger, s.executor, spectrumCommand, nil)
}
func GetClusterIdInternal(logger *log.Logger, executor utils.Executor, command string, args []string) (string, error) {
var clusterId string
Expand Down Expand Up @@ -80,8 +80,8 @@ func (s *spectrum_mmcli) IsFilesystemMounted(filesystemName string) (bool, error
return s.isMounted, nil
}
spectrumCommand := "/usr/lpp/mmfs/bin/mmlsmount"
args := []string{spectrumCommand, filesystemName, "-L", "-Y"}
isMounted, err := IsFilesystemMountedInternal(s.logger, s.executor, filesystemName, "sudo", args)
args := []string{filesystemName, "-L", "-Y"}
isMounted, err := IsFilesystemMountedInternal(s.logger, s.executor, filesystemName, spectrumCommand, args)
s.isMounted = isMounted
return s.isMounted, err
}
Expand Down Expand Up @@ -139,9 +139,9 @@ func (s *spectrum_mmcli) MountFileSystem(filesystemName string) error {
}

spectrumCommand := "/usr/lpp/mmfs/bin/mmmount"
args := []string{spectrumCommand, filesystemName, "-a"}
args := []string{filesystemName, "-a"}

err := MountFileSystemInternal(s.logger, s.executor, filesystemName, "sudo", args)
err := MountFileSystemInternal(s.logger, s.executor, filesystemName, spectrumCommand, args)
if err != nil {
s.logger.Printf("error mounting filesystem %v", err)
return err
Expand All @@ -168,8 +168,8 @@ func (s *spectrum_mmcli) ListFilesystems() ([]string, error) {
}
func (s *spectrum_mmcli) GetFilesystemMountpoint(filesystemName string) (string, error) {
spectrumCommand := "/usr/lpp/mmfs/bin/mmlsfs"
args := []string{spectrumCommand, filesystemName, "-T", "-Y"}
return GetFilesystemMountpointInternal(s.logger, s.executor, filesystemName, "sudo", args)
args := []string{filesystemName, "-T", "-Y"}
return GetFilesystemMountpointInternal(s.logger, s.executor, filesystemName, spectrumCommand, args)
}

func GetFilesystemMountpointInternal(logger *log.Logger, executor utils.Executor, filesystemName string, command string, args []string) (string, error) {
Expand Down Expand Up @@ -212,7 +212,7 @@ func (s *spectrum_mmcli) CreateFileset(filesystemName string, filesetName string

// create fileset
spectrumCommand := "/usr/lpp/mmfs/bin/mmcrfileset"
args := []string{spectrumCommand, filesystemName, filesetName, "-t", "fileset for container volume"}
args := []string{filesystemName, filesetName, "-t", "fileset for container volume"}

filesetType, filesetTypeSpecified := opts[UserSpecifiedFilesetType]
inodeLimit, inodeLimitSpecified := opts[UserSpecifiedInodeLimit]
Expand All @@ -225,7 +225,7 @@ func (s *spectrum_mmcli) CreateFileset(filesystemName string, filesetName string
}
}

return CreateFilesetInternal(s.logger, s.executor, filesystemName, filesetName, "sudo", args)
return CreateFilesetInternal(s.logger, s.executor, filesystemName, filesetName, spectrumCommand, args)
}

func CreateFilesetInternal(logger *log.Logger, executor utils.Executor, filesystemName string, filesetName string, command string, args []string) error {
Expand All @@ -243,8 +243,8 @@ func (s *spectrum_mmcli) DeleteFileset(filesystemName string, filesetName string
defer s.logger.Println("spectrumLocalClient: deleteFileset end")

spectrumCommand := "/usr/lpp/mmfs/bin/mmdelfileset"
args := []string{spectrumCommand, filesystemName, filesetName, "-f"}
return DeleteFilesetInternal(s.logger, s.executor, filesystemName, filesetName, "sudo", args)
args := []string{filesystemName, filesetName, "-f"}
return DeleteFilesetInternal(s.logger, s.executor, filesystemName, filesetName, spectrumCommand, args)
}

func DeleteFilesetInternal(logger *log.Logger, executor utils.Executor, filesystemName string, filesetName string, command string, args []string) error {
Expand All @@ -261,9 +261,9 @@ func (s *spectrum_mmcli) IsFilesetLinked(filesystemName string, filesetName stri
defer s.logger.Println("spectrumLocalClient: isFilesetLinked end")

spectrumCommand := "/usr/lpp/mmfs/bin/mmlsfileset"
args := []string{spectrumCommand, filesystemName, filesetName, "-Y"}
args := []string{filesystemName, filesetName, "-Y"}
s.logger.Printf("%#v\n", args)
return IsFilesetLinkedInternal(s.logger, s.executor, filesystemName, filesetName, "sudo", args)
return IsFilesetLinkedInternal(s.logger, s.executor, filesystemName, filesetName, spectrumCommand, args)
}

func IsFilesetLinkedInternal(logger *log.Logger, executor utils.Executor, filesystemName string, filesetName string, command string, args []string) (bool, error) {
Expand Down Expand Up @@ -308,9 +308,9 @@ func (s *spectrum_mmcli) LinkFileset(filesystemName string, filesetName string)

spectrumCommand := "/usr/lpp/mmfs/bin/mmlinkfileset"
filesetPath := path.Join(mountpoint, filesetName)
args := []string{spectrumCommand, filesystemName, filesetName, "-J", filesetPath}
args := []string{filesystemName, filesetName, "-J", filesetPath}
s.logger.Printf("Args for link fileset%#v", args)
err = LinkFilesetInternal(s.logger, s.executor, filesystemName, filesetName, "sudo", args)
err = LinkFilesetInternal(s.logger, s.executor, filesystemName, filesetName, spectrumCommand, args)
if err != nil {
s.logger.Printf("error linking fileset %v", err)
return err
Expand All @@ -332,8 +332,8 @@ func (s *spectrum_mmcli) UnlinkFileset(filesystemName string, filesetName string
defer s.logger.Println("spectrumLocalClient: unlinkFileset end")

spectrumCommand := "/usr/lpp/mmfs/bin/mmunlinkfileset"
args := []string{spectrumCommand, filesystemName, filesetName}
return UnlinkFilesetInternal(s.logger, s.executor, filesystemName, filesetName, "sudo", args)
args := []string{filesystemName, filesetName}
return UnlinkFilesetInternal(s.logger, s.executor, filesystemName, filesetName, spectrumCommand, args)
}

func UnlinkFilesetInternal(logger *log.Logger, executor utils.Executor, filesystemName string, filesetName string, command string, args []string) error {
Expand All @@ -353,8 +353,8 @@ func (s *spectrum_mmcli) ListFileset(filesystemName string, filesetName string)
defer s.logger.Println("spectrumLocalClient: ListFileset end")

spectrumCommand := "/usr/lpp/mmfs/bin/mmlsfileset"
args := []string{spectrumCommand, filesystemName, filesetName, "-Y"}
return ListFilesetInternal(s.logger, s.executor, filesystemName, filesetName, "sudo", args)
args := []string{filesystemName, filesetName, "-Y"}
return ListFilesetInternal(s.logger, s.executor, filesystemName, filesetName, spectrumCommand, args)
}
func ListFilesetInternal(logger *log.Logger, executor utils.Executor, filesystemName string, filesetName string, command string, args []string) (resources.Volume, error) {
_, err := executor.Execute(command, args)
Expand All @@ -372,8 +372,8 @@ func (s *spectrum_mmcli) ListFilesetQuota(filesystemName string, filesetName str
defer s.logger.Println("spectrumLocalClient: verifyFilesetQuota end")

spectrumCommand := "/usr/lpp/mmfs/bin/mmlsquota"
args := []string{spectrumCommand, "-j", filesetName, filesystemName, "--block-size", "auto"}
return ListFilesetQuotaInternal(s.logger, s.executor, filesystemName, filesetName, "sudo", args)
args := []string{"-j", filesetName, filesystemName, "--block-size", "auto"}
return ListFilesetQuotaInternal(s.logger, s.executor, filesystemName, filesetName, spectrumCommand, args)
}

func ListFilesetQuotaInternal(logger *log.Logger, executor utils.Executor, filesystemName string, filesetName string, command string, args []string) (string, error) {
Expand Down Expand Up @@ -410,8 +410,8 @@ func (s *spectrum_mmcli) SetFilesetQuota(filesystemName string, filesetName stri
s.logger.Printf("setting quota to %s for fileset %s\n", quota, filesetName)

spectrumCommand := "/usr/lpp/mmfs/bin/mmsetquota"
args := []string{spectrumCommand, filesystemName + ":" + filesetName, "--block", quota + ":" + quota}
return SetFilesetQuotaInternal(s.logger, s.executor, filesystemName, filesetName, quota, "sudo", args)
args := []string{filesystemName + ":" + filesetName, "--block", quota + ":" + quota}
return SetFilesetQuotaInternal(s.logger, s.executor, filesystemName, filesetName, quota, spectrumCommand, args)
}

func SetFilesetQuotaInternal(logger *log.Logger, executor utils.Executor, filesystemName string, filesetName string, quota string, command string, args []string) error {
Expand All @@ -431,9 +431,9 @@ func (s *spectrum_mmcli) ExportNfs(volumeMountpoint string, clientConfig string)
defer s.logger.Println("spectrumLocalClient: ExportNfs end")

spectrumCommand := "/usr/lpp/mmfs/bin/mmnfs"
args := []string{spectrumCommand, "export", "add", volumeMountpoint, "--client", clientConfig}
args := []string{"export", "add", volumeMountpoint, "--client", clientConfig}

return ExportNfsInternal(s.logger, s.executor, "sudo", args)
return ExportNfsInternal(s.logger, s.executor, spectrumCommand, args)
}

func ExportNfsInternal(logger *log.Logger, executor utils.Executor, command string, args []string) error {
Expand All @@ -454,9 +454,9 @@ func (s *spectrum_mmcli) UnexportNfs(volumeMountpoint string) error {
defer s.logger.Println("spectrumLocalClient: UnexportNfs end")

spectrumCommand := "/usr/lpp/mmfs/bin/mmnfs"
args := []string{spectrumCommand, "export", "remove", volumeMountpoint, "--force"}
args := []string{"export", "remove", volumeMountpoint, "--force"}

return UnexportNfsInternal(s.logger, s.executor, "sudo", args)
return UnexportNfsInternal(s.logger, s.executor, spectrumCommand, args)
}

func UnexportNfsInternal(logger *log.Logger, executor utils.Executor, command string, args []string) error {
Expand Down
16 changes: 8 additions & 8 deletions local/spectrumscale/spectrumscale.go
Original file line number Diff line number Diff line change
Expand Up @@ -542,17 +542,17 @@ func (s *spectrumLocalClient) createLightweightVolume(filesystem, name, fileset
return err
}
//open permissions on enclosing fileset
args := []string{"chmod", "777", path.Join(mountpoint, fileset)}
_, err = s.executor.Execute("sudo", args)
args := []string{ "777", path.Join(mountpoint, fileset)}
_, err = s.executor.Execute("chmod", args)

if err != nil {
s.logger.Printf("Failed update permissions of fileset %s containing LTW volumes with error: %s", fileset, err.Error())
return err
}

lightweightVolumePath := path.Join(mountpoint, fileset, lightweightVolumeName)
args = []string{"mkdir", "-p", lightweightVolumePath}
_, err = s.executor.Execute("sudo", args)
args = []string{ "-p", lightweightVolumePath}
_, err = s.executor.Execute("mkdir", args)

if err != nil {
s.logger.Printf("Failed to create directory path %s : %s", lightweightVolumePath, err.Error())
Expand Down Expand Up @@ -847,8 +847,8 @@ func (s *spectrumLocalClient) updatePermissions(name string) error {
// executor := utils.NewExecutor() // TODO check why its here ( #39: new logger in block_device_mounter_utils)
filesetPath := path.Join(fsMountpoint, fileset.(string))
//chmod 777 mountpoint
args := []string{"chmod", "777", filesetPath}
_, err = s.executor.Execute("sudo", args)
args := []string{ "777", filesetPath}
_, err = s.executor.Execute("chmod", args)
if err != nil {
s.logger.Printf("Failed to change permissions of filesetpath %s: %s", filesetPath, err.Error())
return err
Expand All @@ -859,8 +859,8 @@ func (s *spectrumLocalClient) updatePermissions(name string) error {
return fmt.Errorf("Cannot determine directory for volume: %s", name)
}
directoryPath := path.Join(filesetPath, directory.(string))
args := []string{"chmod", "777", directoryPath}
_, err = s.executor.Execute("sudo", args)
args := []string{ "777", directoryPath}
_, err = s.executor.Execute("chmod", args)
if err != nil {
s.logger.Printf("Failed to change permissions of directorypath %s: %s", directoryPath, err.Error())
return err
Expand Down
Loading

0 comments on commit d84b6cc

Please sign in to comment.