Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions pkg/services/memcached/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 5 additions & 2 deletions pkg/services/memcached/component_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion pkg/services/memcached/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down