summaryrefslogtreecommitdiff
path: root/libnetwork/service_linux.go
diff options
context:
space:
mode:
authorEng Zer Jun <engzerjun@gmail.com>2021-08-24 18:10:50 +0800
committerEng Zer Jun <engzerjun@gmail.com>2021-08-27 14:56:57 +0800
commitc55a4ac7795c7606b548b38e24673733481e2167 (patch)
tree8ea03bdc842959cd3d04a3e37a4ce2a71fa77dbb /libnetwork/service_linux.go
parent2b70006e3bfa492b8641ff443493983d832955f4 (diff)
downloaddocker-c55a4ac7795c7606b548b38e24673733481e2167.tar.gz
refactor: move from io/ioutil to io and os package
The io/ioutil package has been deprecated in Go 1.16. This commit replaces the existing io/ioutil functions with their new definitions in io and os packages. Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
Diffstat (limited to 'libnetwork/service_linux.go')
-rw-r--r--libnetwork/service_linux.go9
1 files changed, 4 insertions, 5 deletions
diff --git a/libnetwork/service_linux.go b/libnetwork/service_linux.go
index 08010aa564..2954d04ae9 100644
--- a/libnetwork/service_linux.go
+++ b/libnetwork/service_linux.go
@@ -3,7 +3,6 @@ package libnetwork
import (
"fmt"
"io"
- "io/ioutil"
"net"
"os"
"os/exec"
@@ -378,7 +377,7 @@ func programIngress(gwIP net.IP, ingressPorts []*PortConfig, isDelete bool) erro
}
path := filepath.Join("/proc/sys/net/ipv4/conf", oifName, "route_localnet")
- if err := ioutil.WriteFile(path, []byte{'1', '\n'}, 0644); err != nil { //nolint:gosec // gosec complains about perms here, which must be 0644 in this case
+ if err := os.WriteFile(path, []byte{'1', '\n'}, 0644); err != nil { //nolint:gosec // gosec complains about perms here, which must be 0644 in this case
return fmt.Errorf("could not write to %s: %v", path, err)
}
@@ -538,7 +537,7 @@ func plumbProxy(iPort *PortConfig, isDelete bool) error {
}
func writePortsToFile(ports []*PortConfig) (string, error) {
- f, err := ioutil.TempFile("", "port_configs")
+ f, err := os.CreateTemp("", "port_configs")
if err != nil {
return "", err
}
@@ -561,7 +560,7 @@ func writePortsToFile(ports []*PortConfig) (string, error) {
}
func readPortsFromFile(fileName string) ([]*PortConfig, error) {
- buf, err := ioutil.ReadFile(fileName)
+ buf, err := os.ReadFile(fileName)
if err != nil {
return nil, err
}
@@ -671,7 +670,7 @@ func fwMarker() {
rule := append(strings.Fields("-t nat -A POSTROUTING"), ruleParams...)
rules = append(rules, rule)
- err := ioutil.WriteFile("/proc/sys/net/ipv4/vs/conntrack", []byte{'1', '\n'}, 0644)
+ err := os.WriteFile("/proc/sys/net/ipv4/vs/conntrack", []byte{'1', '\n'}, 0644)
if err != nil {
logrus.Errorf("Failed to write to /proc/sys/net/ipv4/vs/conntrack: %v", err)
os.Exit(7)