diff --git a/Makefile b/Makefile index c8e40ba..630650f 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,6 @@ COMPOSE_UI = $(COMPOSE) --profile ui MYSQL_SAMPLES_TMP_DIR := .tmp/mysql-samples SAKILA_URL := https://downloads.mysql.com/docs/sakila-db.zip -SAKILA_SHA256 := 86c6e32c9b3f382fa709019a76c41cc1cd826368dd048f7b7323aaef5af968f4 POSTGRES_SAMPLES_TMP_DIR := .tmp/postgres-samples PAGILA_REF := 5ba5a57aeb159f75f02aca2432d3c262186d13d3 PAGILA_BASE_URL := https://raw.githubusercontent.com/devrimgunduz/pagila/$(PAGILA_REF) @@ -271,7 +270,6 @@ samples-mysql: check-env @command -v curl >/dev/null || { echo "ERROR: требуется curl" >&2; exit 1; } @command -v unzip >/dev/null || { echo "ERROR: требуется unzip" >&2; exit 1; } @command -v git >/dev/null || { echo "ERROR: требуется git для проверки Git blob SHA" >&2; exit 1; } - @command -v sha256sum >/dev/null || { echo "ERROR: требуется sha256sum" >&2; exit 1; } @set -Eeuo pipefail; $(LOAD_ENV) \ tmp_root="$(MYSQL_SAMPLES_TMP_DIR)"; \ download_dir="$${tmp_root}/download"; \ @@ -308,7 +306,6 @@ samples-mysql: check-env "$(CHINOOK_MYSQL_URL)" -o "$${download_dir}/Chinook_MySql.sql"; \ curl --fail --location --retry 3 --retry-all-errors --connect-timeout 15 --max-time 180 \ "$(SAKILA_URL)" -o "$${download_dir}/sakila-db.zip"; \ - echo "$(SAKILA_SHA256) $${download_dir}/sakila-db.zip" | sha256sum --check --status || { echo "ERROR: неожиданный SHA-256 sakila-db.zip" >&2; exit 1; }; \ test "$$(git hash-object --no-filters "$${download_dir}/LICENSE.md")" = "$(CHINOOK_LICENSE_BLOB)" || { echo "ERROR: неожиданный Git blob SHA LICENSE.md" >&2; exit 1; }; \ test "$$(git hash-object --no-filters "$${download_dir}/Chinook_MySql.sql")" = "$(CHINOOK_MYSQL_BLOB)" || { echo "ERROR: неожиданный Git blob SHA Chinook_MySql.sql" >&2; exit 1; }; \ test -s "$${download_dir}/LICENSE.md" || { echo "ERROR: LICENSE.md пуст" >&2; exit 1; }; \ diff --git a/README.md b/README.md index 93b6ad1..25958b5 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,7 @@ [![PostgreSQL Check](https://github.com/yaleksandr89/docker-sql-lab/actions/workflows/postgres-check.yml/badge.svg)](https://github.com/yaleksandr89/docker-sql-lab/actions/workflows/postgres-check.yml) [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md) -

- Docker SQL Lab — локальный стенд MySQL и PostgreSQL -

+![Docker SQL Lab — локальный стенд MySQL и PostgreSQL](docs/assets/docker-sql-lab-cover.png) ## Выберите язык diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 05c3ddb..a48810f 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -100,8 +100,6 @@ SOFTWARE. - Official archive: `https://downloads.mysql.com/docs/sakila-db.zip` -- Verified archive SHA-256: - `86c6e32c9b3f382fa709019a76c41cc1cd826368dd048f7b7323aaef5af968f4` - Files used: - `sakila-schema.sql` - `sakila-data.sql` @@ -113,7 +111,9 @@ the New BSD license. Other materials in the distribution are not covered by that open license. SQL Lab extracts only those two SQL files. It does not publish the Sakila -documentation or `sakila.mwb`. Before extraction, the archive SHA-256 is -verified. Both SQL files must contain the expected New BSD notice and +documentation or `sakila.mwb`. The archive is downloaded over HTTPS from the +official MySQL URL. Its archive-level SHA-256 is intentionally not pinned +because the upstream URL is unversioned and its bytes may change independently +of this repository. Both SQL files must contain the expected New BSD notice and disclaimer, and they are copied without modifying their embedded copyright and license text. diff --git a/docs/langs/README_de.md b/docs/langs/README_de.md index b2c3f8a..ae9736c 100644 --- a/docs/langs/README_de.md +++ b/docs/langs/README_de.md @@ -6,13 +6,7 @@ [![PostgreSQL Check](https://github.com/yaleksandr89/docker-sql-lab/actions/workflows/postgres-check.yml/badge.svg)](https://github.com/yaleksandr89/docker-sql-lab/actions/workflows/postgres-check.yml) [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](../../LICENSE.md) -

- Docker SQL Lab — lokale MySQL- und PostgreSQL-Umgebung -

+![Docker SQL Lab — lokale MySQL- und PostgreSQL-Umgebung](../assets/docker-sql-lab-cover.png) ## Sprache auswählen diff --git a/docs/langs/README_en.md b/docs/langs/README_en.md index 8da366f..5dde09a 100644 --- a/docs/langs/README_en.md +++ b/docs/langs/README_en.md @@ -6,13 +6,7 @@ [![PostgreSQL Check](https://github.com/yaleksandr89/docker-sql-lab/actions/workflows/postgres-check.yml/badge.svg)](https://github.com/yaleksandr89/docker-sql-lab/actions/workflows/postgres-check.yml) [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](../../LICENSE.md) -

- Docker SQL Lab -

+![Docker SQL Lab](../assets/docker-sql-lab-cover.png) ## Choose a language diff --git a/docs/langs/README_es.md b/docs/langs/README_es.md index e7422a0..e0acd07 100644 --- a/docs/langs/README_es.md +++ b/docs/langs/README_es.md @@ -6,13 +6,7 @@ [![PostgreSQL Check](https://github.com/yaleksandr89/docker-sql-lab/actions/workflows/postgres-check.yml/badge.svg)](https://github.com/yaleksandr89/docker-sql-lab/actions/workflows/postgres-check.yml) [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](../../LICENSE.md) -

- Docker SQL Lab — entorno local de MySQL y PostgreSQL -

+![Docker SQL Lab — entorno local de MySQL y PostgreSQL](../assets/docker-sql-lab-cover.png) ## Elija un idioma diff --git a/docs/langs/README_fr.md b/docs/langs/README_fr.md index 8a9ab0d..83dcd86 100644 --- a/docs/langs/README_fr.md +++ b/docs/langs/README_fr.md @@ -6,13 +6,7 @@ [![PostgreSQL Check](https://github.com/yaleksandr89/docker-sql-lab/actions/workflows/postgres-check.yml/badge.svg)](https://github.com/yaleksandr89/docker-sql-lab/actions/workflows/postgres-check.yml) [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](../../LICENSE.md) -

- Docker SQL Lab — environnement local MySQL et PostgreSQL -

+![Docker SQL Lab — environnement local MySQL et PostgreSQL](../assets/docker-sql-lab-cover.png) ## Choisissez une langue diff --git a/docs/langs/README_zh.md b/docs/langs/README_zh.md index a53ce84..0eff9f2 100644 --- a/docs/langs/README_zh.md +++ b/docs/langs/README_zh.md @@ -6,13 +6,7 @@ [![PostgreSQL Check](https://github.com/yaleksandr89/docker-sql-lab/actions/workflows/postgres-check.yml/badge.svg)](https://github.com/yaleksandr89/docker-sql-lab/actions/workflows/postgres-check.yml) [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](../../LICENSE.md) -

- Docker SQL Lab — 本地 MySQL 与 PostgreSQL 实验环境 -

+![Docker SQL Lab — 本地 MySQL 与 PostgreSQL 实验环境](../assets/docker-sql-lab-cover.png) ## 选择语言