Updated docker file

djthorpe · djthorpe · commit 3b0e8337d35a · 2022-12-17T15:07:23.000+01:00
diff --git a/Makefile b/Makefile
@@ -1,12 +1,13 @@
 # Paths to packages
 GO=$(shell which go)
+DOCKER=$(shell which docker)
 
 # Paths to locations, etc
 BUILD_DIR := "build"
 CMD_DIR := $(filter-out cmd/README.md, $(wildcard cmd/*))
 
 # Build flags
-BUILD_MODULE = "github.com/mutablelogic/go-media"
+BUILD_MODULE := $(shell go list -m)
 BUILD_LD_FLAGS += -X $(BUILD_MODULE)/pkg/config.GitSource=${BUILD_MODULE}
 BUILD_LD_FLAGS += -X $(BUILD_MODULE)/pkg/config.GitTag=$(shell git describe --tags)
 BUILD_LD_FLAGS += -X $(BUILD_MODULE)/pkg/config.GitBranch=$(shell git name-rev HEAD --name-only --always)
@@ -28,6 +29,15 @@ $(PLUGIN_DIR): FORCE
 
 FORCE:
 
+docker:
+	@echo Build docker image
+	@${DOCKER} build \
+	    --tag go-media:$(shell git describe --tags) \
+		--build-arg PLATFORM=$(shell ${GO} env GOOS) \
+		--build-arg ARCH=$(shell ${GO} env GOARCH) \
+		--build-arg VERSION=kinetic \
+		-f etc/docker/Dockerfile .
+
 test: clean dependencies
 	@echo Test sys/
 	@${GO} test ./sys/...
diff --git a/etc/docker/Dockerfile b/etc/docker/Dockerfile
@@ -1,12 +1,26 @@
 # recommended way to build is using:
 # docker build \
-#   --build-arg PLATFORM=linux --build-arg ARCH=amd64 --build-arg VERSION=bullseye \
+#   --build-arg PLATFORM=linux --build-arg ARCH=amd64 --build-arg VERSION=focal \
 #   -f etc/docker/Dockerfile .
 #
+# ${VERSION} should be "focal"
 ARG PLATFORM
 ARG ARCH
 ARG VERSION
-FROM --platform=${PLATFORM}/${ARCH} golang:1.19-${VERSION} AS builder
+FROM --platform=${PLATFORM}/${ARCH} ubuntu:${VERSION} AS builder
+
+# update the base packages
+ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/Berlin"
+RUN apt-get update -y && apt-get upgrade -y
+
+# install packages
+RUN apt-get install -y apt-utils golang make pkg-config ca-certificates lsb-release software-properties-common
+
+# install other build dependencies
+# note we need to install ffmpeg 4 from a different repo for bionic
+RUN apt-get install -y  \
+  libavcodec-dev libavdevice-dev libavfilter-dev \
+  libavformat-dev libswresample-dev libavutil-dev libchromaprint-dev
 
 # Run makefile to build command-line tools
 WORKDIR /usr/src/app
diff --git a/sys/dvb/demux.go b/sys/dvb/demux.go
@@ -1,4 +1,4 @@
-// +build dvb
+//go:build dvb
 
 package dvb
 
diff --git a/sys/dvb/demux_test.go b/sys/dvb/demux_test.go
@@ -1,11 +1,10 @@
-// +build dvb
+//go:build dvb
 
 package dvb_test
 
 import (
+	"github.com/mutablelogic/go-media/sys/dvb"
 	"testing"
-
-	"github.com/djthorpe/gopi/v3/pkg/sys/dvb"
 )
 
 func Test_Demux_000(t *testing.T) {
diff --git a/sys/dvb/device.go b/sys/dvb/device.go
@@ -1,4 +1,4 @@
-// +build dvb
+//go:build dvb
 
 package dvb
 
@@ -10,8 +10,6 @@ import (
 	"strings"
 	"syscall"
 	"unsafe"
-
-	"github.com/djthorpe/gopi/v3"
 )
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/sys/dvb/device_test.go b/sys/dvb/device_test.go
@@ -1,12 +1,11 @@
-// +build dvb
+//go:build dvb
 
 package dvb_test
 
 import (
+	"github.com/mutablelogic/go-media/sys/dvb"
 	"os"
 	"testing"
-
-	"github.com/djthorpe/gopi/v3/pkg/sys/dvb"
 )
 
 func Test_Device_000(t *testing.T) {
diff --git a/sys/dvb/frontend.go b/sys/dvb/frontend.go
@@ -1,4 +1,4 @@
-// +build dvb
+//go:build dvb
 
 package dvb
 
diff --git a/sys/dvb/frontend_test.go b/sys/dvb/frontend_test.go
@@ -1,13 +1,12 @@
-// +build dvb
+//go:build dvb
 
 package dvb_test
 
 import (
+	"github.com/mutablelogic/go-media/sys/dvb"
 	"os"
 	"testing"
 	"time"
-
-	"github.com/djthorpe/gopi/v3/pkg/sys/dvb"
 )
 
 func Test_Frontend_000(t *testing.T) {
diff --git a/sys/dvb/tunetable.go b/sys/dvb/tunetable.go
@@ -1,3 +1,5 @@
+//go:build dvb
+
 package dvb
 
 import (
diff --git a/sys/dvb/tunetable_test.go b/sys/dvb/tunetable_test.go
@@ -1,4 +1,4 @@
-// +build dvb
+//go:build dvb
 
 package dvb_test
 
diff --git a/sys/ffmpeg51/avformat_test.go b/sys/ffmpeg51/avformat_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 const (
-	SAMPLE_MP4 = "../../etc/sample.mp4"
+	SAMPLE_MP4 = "../../etc/test/sample.mp4"
 )
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/sys/ffmpeg51/avutil_test.go b/sys/ffmpeg51/avutil_test.go
@@ -88,20 +88,22 @@ func Test_avutil_002(t *testing.T) {
 
 func Test_avutil_003(t *testing.T) {
 	var dict *ffmpeg.AVDictionary
+	var err error
 	assert := assert.New(t)
-	assert.NoError(ffmpeg.AVUtil_av_dict_set(dict, "a", "b", 0))
+	dict, err = ffmpeg.AVUtil_av_dict_set_ptr(dict, "a", "b", 0)
+	assert.NoError(err)
+	assert.NotNil(dict)
+	dict, err = ffmpeg.AVUtil_av_dict_set_ptr(dict, "b", "b", 0)
+	assert.NoError(err)
 	assert.NotNil(dict)
-	assert.NoError(ffmpeg.AVUtil_av_dict_set(dict, "a", "b", 0))
-	assert.NoError(ffmpeg.AVUtil_av_dict_set(dict, "b", "a", 0))
 	t.Log(dict)
 	keys := ffmpeg.AVUtil_av_dict_keys(dict)
 	assert.Equal(2, len(keys))
 	entries := ffmpeg.AVUtil_av_dict_entries(dict)
 	assert.Equal(2, len(entries))
 	t.Log(keys)
 	t.Log(entries)
-	ffmpeg.AVUtil_av_dict_free(&dict)
-	assert.Nil(dict)
+	ffmpeg.AVUtil_av_dict_free_ptr(dict)
 }
 
 func Test_avutil_006(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build dvb`
	`1`	`+//go:build dvb`
`2`	`2`
`3`	`3`	`package dvb`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//go:build dvb`
	`2`	`+`
`1`	`3`	`package dvb`
`2`	`4`
`3`	`5`	`import (`