Merge pull request #158 from clux/fix-update-and-update

fix update and bump sccache, rustup and sqlite

Author: clux

Dockerfile

@@ -39,7 +39,7 @@ RUN apt-get update && apt-get install -y \
 ARG AARCH
 # Install rust using rustup
 ARG CHANNEL
-ENV RUSTUP_VER="1.27.1" \
+ENV RUSTUP_VER="1.28.2" \
     RUST_ARCH="${AARCH}-unknown-linux-gnu" \
     CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
 
@@ -55,9 +55,9 @@ RUN chmod a+X /root
 # Convenience list of versions and variables for compilation later on
 # This helps continuing manually if anything breaks.
 ENV ZLIB_VER="1.3.1" \
-    SQLITE_VER="3490100" \
+    SQLITE_VER="3490200" \
     PROTOBUF_VER="31.0" \
-    SCCACHE_VER="0.9.1" \
+    SCCACHE_VER="0.10.0" \
     CC=musl-gcc \
     PREFIX=/musl \
     PATH=/usr/local/bin:/root/.cargo/bin:$PATH \

update_libs.py

@@ -84,20 +84,19 @@ def rustup_version():
         print('{}_VER="{}"'.format(prefix, PACKAGES[prefix]))
 
     # Update Dockerfiles
-    for arch in ["x86_64", "arm64"]:
-        fname = f'./Dockerfile.{arch}'
-        # Open a different file for the destination to update Dockerfile atomically
-        src = open(fname, 'r')
-        dst = open(f'{fname}.new', 'w')
-
-        # Iterate over each line in Dockerfile, replacing any *_VER variables with the most recent version
-        for line in src:
-            for prefix in PACKAGES:
-                version = PACKAGES[prefix]
-                line = re.sub(r'({}_VER=)\S+'.format(prefix), r'\1"{}"'.format(version), line)
-            dst.write(line)
-
-        # Close original and new Dockerfile then overwrite the old with the new
-        src.close()
-        dst.close()
-        os.rename(f'{fname}.new', fname)
+    fname = './Dockerfile'
+    # Open a different file for the destination to update Dockerfile atomically
+    src = open(fname, 'r')
+    dst = open(f'{fname}.new', 'w')
+
+    # Iterate over each line in Dockerfile, replacing any *_VER variables with the most recent version
+    for line in src:
+        for prefix in PACKAGES:
+            version = PACKAGES[prefix]
+            line = re.sub(r'({}_VER=)\S+'.format(prefix), r'\1"{}"'.format(version), line)
+        dst.write(line)
+
+    # Close original and new Dockerfile then overwrite the old with the new
+    src.close()
+    dst.close()
+    os.rename(f'{fname}.new', fname)