diff --git a/pkg/services/memcached/component.go b/pkg/services/memcached/component.go index a541d85..d57b9cd 100644 --- a/pkg/services/memcached/component.go +++ b/pkg/services/memcached/component.go @@ -47,13 +47,11 @@ func New(opts TargetOptions) (ServiceComponent, error) { AllowedDispositions: []corecomponent.Disposition{ corecomponent.DispositionEnabled, corecomponent.DispositionDisabled, - corecomponent.DispositionDistributed, }, Dependencies: opts.Dependencies, Guidance: corecomponent.StateGuidance{ - EnabledHelp: "Run Memcached in this compose project.", - DisabledHelp: "Remove the local Memcached service from this compose project.", - DistributedHelp: "Use an external cache service and keep this compose project from managing Memcached.", + EnabledHelp: "Run Memcached in this compose project.", + DisabledHelp: "Remove the local Memcached service from this compose project.", }, Behavior: opts.Behavior, ExtraOnRules: opts.ExtraOnRules, diff --git a/pkg/services/memcached/component_test.go b/pkg/services/memcached/component_test.go index 3165acb..43153d3 100644 --- a/pkg/services/memcached/component_test.go +++ b/pkg/services/memcached/component_test.go @@ -43,8 +43,11 @@ func TestNewBuildsMemcachedServiceComponent(t *testing.T) { if def.DefaultState != corecomponent.StateOn { t.Fatalf("DefaultState = %q, want %q", def.DefaultState, corecomponent.StateOn) } - if !allowsDisposition(def, corecomponent.DispositionDistributed) { - t.Fatalf("AllowedDispositions = %v, want distributed", def.AllowedDispositions) + if !allowsDisposition(def, corecomponent.DispositionEnabled) || !allowsDisposition(def, corecomponent.DispositionDisabled) { + t.Fatalf("AllowedDispositions = %v, want enabled and disabled", def.AllowedDispositions) + } + if allowsDisposition(def, corecomponent.DispositionDistributed) { + t.Fatalf("AllowedDispositions = %v, did not expect distributed", def.AllowedDispositions) } if len(def.On.Compose.Rules) == 0 { t.Fatal("expected enable compose rules") diff --git a/pkg/services/memcached/docker-compose.yml b/pkg/services/memcached/docker-compose.yml index 9d7b388..bc15ea9 100644 --- a/pkg/services/memcached/docker-compose.yml +++ b/pkg/services/memcached/docker-compose.yml @@ -1,6 +1,6 @@ services: memcached: - image: ${MEMCACHED_IMAGE:-memcached:1.6-alpine} + image: ${MEMCACHED_IMAGE:-memcached:1.6-alpine@sha256:43a2e7f74aebfff0c9921f4d367299ced9eacaeaccdc8bb4bc122a4fba2cd909} restart: unless-stopped networks: default: