From 94a2e9050ad2dbe80a2cb2bd12ea0ddd8a9744b6 Mon Sep 17 00:00:00 2001 From: "ila.sahu8@gmail.com" Date: Tue, 15 Aug 2023 17:04:55 +0200 Subject: [PATCH 1/4] update: debian version updated and readme updated [CRE-2225] --- Dockerfile | 2 +- README.md | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0d7ad2175e3..221b5af7731 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ # # TODO: push to apache/thrift-compiler instead of thrift/thrift-compiler -FROM debian:jessie +FROM debian:bookworm MAINTAINER Apache Thrift ENV DEBIAN_FRONTEND noninteractive diff --git a/README.md b/README.md index a55389a02b5..7cb8eb20582 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 +http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an @@ -40,16 +40,28 @@ For more details on Thrift's design and implementation, take a gander at the Thrift whitepaper included in this distribution or at the README.md files in your particular subdirectory of interest. +Note +============ + +We decided to not remove the travis and not include github actions because we don't make changes, if you wish to make any changes to the docker images, you should follow the following steps +• fork the project +• Update changes +• Build the docker image with the following command +docker build -t registry.jimdo-platform.net/jimdo/thrift:stable --platform=linux/amd64 +• Push the docker image +wl docker push registry.jimdo-platform.net/jimdo/thrift:stable +• You should be able to see the updated image everywhere + Hierarchy ========= thrift/ - compiler/ +compiler/ Contains the Thrift compiler, implemented in C++. - lib/ +lib/ Contains the Thrift software library implementation, subdivided by language of implementation. @@ -61,12 +73,12 @@ thrift/ py/ rb/ - test/ +test/ Contains sample Thrift files and test code across the target programming languages. - tutorial/ +tutorial/ Contains a basic tutorial that will teach you how to develop software using Thrift. From ac2efa28776ae7f48284a6265e294bbe8e5897a9 Mon Sep 17 00:00:00 2001 From: "ila.sahu8@gmail.com" Date: Wed, 16 Aug 2023 08:12:41 +0200 Subject: [PATCH 2/4] fix: remove the type [CRE-2225] --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 7cb8eb20582..269f098be3f 100644 --- a/README.md +++ b/README.md @@ -43,8 +43,7 @@ in your particular subdirectory of interest. Note ============ -We decided to not remove the travis and not include github actions because we don't make changes, if you wish to make any changes to the docker images, you should follow the following steps -• fork the project +We decided to not remove the travis and not include github actions because we don't make changes, if you wish to make any changes to the docker images, you should follow the following steps • Update changes • Build the docker image with the following command docker build -t registry.jimdo-platform.net/jimdo/thrift:stable --platform=linux/amd64 From 97d79808a778cd65a21cc86b993082d27d504b12 Mon Sep 17 00:00:00 2001 From: "ila.sahu8@gmail.com" Date: Wed, 16 Aug 2023 08:16:17 +0200 Subject: [PATCH 3/4] fix: make the readme compatible [CRE-2225] --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 269f098be3f..c7eb144503a 100644 --- a/README.md +++ b/README.md @@ -44,12 +44,12 @@ Note ============ We decided to not remove the travis and not include github actions because we don't make changes, if you wish to make any changes to the docker images, you should follow the following steps -• Update changes -• Build the docker image with the following command -docker build -t registry.jimdo-platform.net/jimdo/thrift:stable --platform=linux/amd64 -• Push the docker image -wl docker push registry.jimdo-platform.net/jimdo/thrift:stable -• You should be able to see the updated image everywhere +- Update changes +- Build the docker image with the following command +```docker build -t registry.jimdo-platform.net/jimdo/thrift:stable --platform=linux/amd64``` +- Push the docker image +```wl docker push registry.jimdo-platform.net/jimdo/thrift:stable``` +- You should be able to see the updated image everywhere Hierarchy ========= From 1667ab65a50821049c6d3272ed5b27a00523ab04 Mon Sep 17 00:00:00 2001 From: "ila.sahu8@gmail.com" Date: Wed, 16 Aug 2023 08:18:19 +0200 Subject: [PATCH 4/4] fix: moved the note to the top [CRE-2225] --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index c7eb144503a..b8cff5fc466 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,17 @@ Apache Thrift Last Modified: 2014-03-16 +Note +============ + +We decided to not remove the travis and not include github actions because we don't make changes, if you wish to make any changes to the docker images, you should follow the following steps +- Update changes +- Build the docker image with the following command + ```docker build -t registry.jimdo-platform.net/jimdo/thrift:stable --platform=linux/amd64``` +- Push the docker image + ```wl docker push registry.jimdo-platform.net/jimdo/thrift:stable``` +- You should be able to see the updated image everywhere + License ======= @@ -40,17 +51,6 @@ For more details on Thrift's design and implementation, take a gander at the Thrift whitepaper included in this distribution or at the README.md files in your particular subdirectory of interest. -Note -============ - -We decided to not remove the travis and not include github actions because we don't make changes, if you wish to make any changes to the docker images, you should follow the following steps -- Update changes -- Build the docker image with the following command -```docker build -t registry.jimdo-platform.net/jimdo/thrift:stable --platform=linux/amd64``` -- Push the docker image -```wl docker push registry.jimdo-platform.net/jimdo/thrift:stable``` -- You should be able to see the updated image everywhere - Hierarchy =========